diff --git a/photologue/models.py b/photologue/models.py index eddf4de7..7e5ab25c 100644 --- a/photologue/models.py +++ b/photologue/models.py @@ -33,16 +33,17 @@ from django.contrib.sites.models import Site # Required PIL classes may or may not be available from the root namespace # depending on the installation method used. try: - import Image - import ImageFile - import ImageFilter - import ImageEnhance + from PIL import Image + from PIL import ImageFile + from PIL import ImageFilter + from PIL import ImageEnhance + except ImportError: try: - from PIL import Image - from PIL import ImageFile - from PIL import ImageFilter - from PIL import ImageEnhance + import Image + import ImageFile + import ImageFilter + import ImageEnhance except ImportError: raise ImportError( 'Photologue was unable to import the Python Imaging Library. Please confirm it`s installed and available on your current Python path.') diff --git a/templates/client/includes/event_steps.html b/templates/client/includes/event_steps.html index 4b432828..b2ead11d 100644 --- a/templates/client/includes/event_steps.html +++ b/templates/client/includes/event_steps.html @@ -6,7 +6,7 @@