Mercurial > hg > montage

changeset 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 5a3945882d04
children 4a81659a17f7
files montage/formatters.py setup.py
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
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"""
 
--- a/setup.py	Wed Jan 11 16:28:16 2012 -0800
+++ b/setup.py	Tue Aug 28 22:03:34 2012 -0700
@@ -1,7 +1,7 @@
 import os
 from setuptools import setup, find_packages
 
-version = '0.3.5'
+version = '0.3.6'
 
 try:
     description = file(os.path.join(os.path.dirname(__file__), 'README.txt')).read()