p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #25108 -- Fixed a test which failed on Pillow 2.9+

This commit is contained in:
Yosuke Yasuda 2015-07-12 12:48:13 +09:00 committed by Tim Graham
parent 97bc875234
commit a2b999dfca
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/forms_tests/tests/test_fields.py
View File

@ -847,8 +847,10 @@ class FieldsTests(SimpleTestCase):
This also tests the situation when Pillow doesn't detect the MIME type This also tests the situation when Pillow doesn't detect the MIME type
of the image (#24948). of the image (#24948).
""" """
from PIL.BmpImagePlugin import BmpImageFile
try:
Image.register_mime(BmpImageFile.format, None)
f = ImageField() f = ImageField()
img_path = os.path.dirname(upath(__file__)) + '/filepath_test_files/1x1.bmp' img_path = os.path.dirname(upath(__file__)) + '/filepath_test_files/1x1.bmp'
with open(img_path, 'rb') as img_file: with open(img_path, 'rb') as img_file:
img_data = img_file.read() img_data = img_file.read()
@ -860,6 +862,8 @@ class FieldsTests(SimpleTestCase):
self.assertEqual('BMP', uploaded_file.image.format) self.assertEqual('BMP', uploaded_file.image.format)
self.assertIsNone(uploaded_file.content_type) self.assertIsNone(uploaded_file.content_type)
finally:
Image.register_mime(BmpImageFile.format, 'image/bmp')
# URLField ################################################################## # URLField ##################################################################