summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorRaúl Cumplido <raulcumplido@gmail.com>2015-03-22 13:46:38 +0000
committerTim Graham <timograham@gmail.com>2015-03-25 12:39:29 -0400
commitcda74c7fc99abe1848e1f4965070108dd2ae378a (patch)
tree0b520d52aaf8131396ba153b6165b33e43619be6 /django
parentcb506aed2a3ca439a7ed6cff410667f302405c8b (diff)
Fixed #24441 -- Changed get_image_dimensions() return value for broken images
Diffstat (limited to 'django')
-rw-r--r--django/core/files/images.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/core/files/images.py b/django/core/files/images.py
index 8883ae4416..f5254e37a6 100644
--- a/django/core/files/images.py
+++ b/django/core/files/images.py
@@ -66,7 +66,7 @@ def get_image_dimensions(file_or_path, close=False):
if p.image:
return p.image.size
chunk_size *= 2
- return None
+ return (None, None)
finally:
if close:
file.close()