Merge branch 'master' of github.com:python-imaging/Pillow

This commit is contained in:
Alex Clark 2013-03-13 21:38:34 -04:00
commit 9b132eed9b

View File

@ -313,13 +313,11 @@ def getdraw(im=None, hints=None):
handler = None handler = None
if not hints or "nicest" in hints: if not hints or "nicest" in hints:
try: try:
import _imagingagg import _imagingagg as handler
handler = _imagingagg
except ImportError: except ImportError:
pass pass
if handler is None: if handler is None:
from PIL import ImageDraw2 from PIL import ImageDraw2 as handler
handler = ImageDraw2
if im: if im:
im = handler.Draw(im) im = handler.Draw(im)
return im, handler return im, handler