mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-22 17:16:24 +00:00
Code Issues 25 Releases Wiki Activity

Replaced six.reraise with a simple raise.

Browse Source
This commit is contained in:
Florian Apolloner 2013-01-01 13:20:36 +01:00
parent a4a4b139cd
commit 7cb0cd5aff
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/core/files/images.py
View File

@ -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