Ticket #8187: patch-8185-vs-r8255.diff

tests/modeltests/model_forms/models.py

@@ -75 +75 @@
         # Checking for the existence of Image is enough for CPython, but
         # for PyPy, you need to check for the underlying modules
         # If PIL is not available, this test is equivalent to TextFile above.
-        import Image, _imaging
+        from PIL import Image, _imaging
         image = models.ImageField(storage=temp_storage, upload_to='tests')
     except ImportError:
         image = models.FileField(storage=temp_storage, upload_to='tests')

tests/regressiontests/file_storage/models.py

@@ -12 +12 @@
 try:
     # Checking for the existence of Image is enough for CPython, but
     # for PyPy, you need to check for the underlying modules
-    import Image, _imaging
+    from PIL import Image, _imaging
 except ImportError:
     Image = None