Commit 6f602475 authored by Jacob Kaplan-Moss's avatar Jacob Kaplan-Moss
Browse files

Don't import PIL until needed so that systems without PIL don't barf.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8249 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 84afcf5a
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ Utility functions for handling images.
Requires PIL, as you might imagine.
"""

from PIL import ImageFile as PIL
from django.core.files import File

class ImageFile(File):
@@ -27,7 +26,8 @@ class ImageFile(File):

def get_image_dimensions(file_or_path):
    """Returns the (width, height) of an image, given an open file or a path."""
    p = PIL.Parser()
    from PIL import ImageFile as PILImageFile
    p = PILImageFile.Parser()
    if hasattr(file_or_path, 'read'):
        file = file_or_path
    else: