patches to be jython compatible

mezzanine/core/templatetags/mezzanine_tags.py

@@ -20,7 +20,11 @@
 from django.utils.simplejson import loads
 from django.utils.text import capfirst
 
-from PIL import Image, ImageFile, ImageOps
+# Try to import PIL in either of the two ways it can end up installed. // e.g. no PIL for jython, but maybe compatible libs
+try:
+    from PIL import Image, ImageFile, ImageOps
+except ImportError:
+    import Image, ImageFile, ImageOps
 
 from mezzanine.conf import settings
 from mezzanine.core.fields import RichTextField

mezzanine/galleries/models.py

@@ -51,7 +51,11 @@ def save(self, delete_zip_import=True, *args, **kwargs):
         super(Gallery, self).save(*args, **kwargs)
         if self.zip_import:
             zip_file = ZipFile(self.zip_import)
-            from PIL import Image
+            # Try to import PIL in either of the two ways it can end up installed.
+            try:
+                from PIL import Image
+            except ImportError:
+                import Image
             for name in zip_file.namelist():
                 data = zip_file.read(name)
                 try:

setup.py

@@ -1,6 +1,7 @@
 
 from __future__ import with_statement
 import os
+import sys
 
 
 exclude = ["mezzanine/project_template/dev.db",
@@ -34,7 +35,12 @@
 try:
     from PIL import Image, ImageOps
 except ImportError:
-    install_requires += ["pillow"]
+    try:
+        import Image, ImageFile, ImageOps
+    except ImportError:
+        # no way to install pillow/PIL with jython, so exclude this in any case
+        if not sys.platform.startswith('java'):
+            install_requires += ["pillow"]
 
 
 try: