Commit 7cb0cd5a authored by Florian Apolloner's avatar Florian Apolloner
Browse files

Replaced six.reraise with a simple raise.

parent a4a4b139
Loading
Loading
Loading
Loading
+3 −4
Original line number Diff line number Diff line
@@ -3,12 +3,10 @@ Utility functions for handling images.

Requires PIL, as you might imagine.
"""

import zlib
import sys

from django.core.files import File
from django.utils import six


class ImageFile(File):
    """
@@ -30,6 +28,7 @@ class ImageFile(File):
            self._dimensions_cache = get_image_dimensions(self, close=close)
        return self._dimensions_cache


def get_image_dimensions(file_or_path, close=False):
    """
    Returns the (width, height) of an image, given an open file or a path.  Set
@@ -67,7 +66,7 @@ def get_image_dimensions(file_or_path, close=False):
                if e.args[0].startswith("Error -5"):
                    pass
                else:
                    six.reraise(*sys.exc_info())
                    raise
            if p.image:
                return p.image.size
            chunk_size = chunk_size*2