Mercurial > hg > montage

diff montage/formatters.py @ 31:d98c9e7415c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
better importing
author Jeff Hammel <jhammel@mozilla.com>
date Tue, 28 Aug 2012 22:03:34 -0700
parents ca43a7f71985
children 529598840f4b
line wrap: on
line diff
--- a/montage/formatters.py	Wed Jan 11 16:28:16 2012 -0800
+++ b/montage/formatters.py	Tue Aug 28 22:03:34 2012 -0700
@@ -4,10 +4,15 @@
 
 import mimetypes
 import os
-import Image
 from cropresize import crop_resize
 from decoupage.formatters import FormatterBase
 
+# PIL
+try:
+    import Image
+except:
+    from PIL import Image
+
 class Images(FormatterBase):
     """display images with thumbnails"""