Added __copy__ method to Image

ThoughtSynth · Mar 16, 2016 · bb0d312 · bb0d312
1 parent d3727b5
commit bb0d312
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/PIL/Image.py b/PIL/Image.py
@@ -1012,6 +1012,8 @@ def copy(self):
         im = self.im.copy()
         return self._new(im)
 
+    __copy__ = copy
+
     def crop(self, box=None):
         """
         Returns a rectangular region from this image. The box is a

diff --git a/Tests/test_image_copy.py b/Tests/test_image_copy.py
@@ -1,16 +1,37 @@
 from helper import unittest, PillowTestCase, hopper
 
+import copy
+
 
 class TestImageCopy(PillowTestCase):
 
     def test_copy(self):
-        def copy(mode):
+        croppedCoordinates = (10, 10, 20, 20)
+        croppedSize = (10, 10)
+        for mode in "1", "P", "L", "RGB", "I", "F":
+            # Internal copy method
             im = hopper(mode)
             out = im.copy()
-            self.assertEqual(out.mode, mode)
+            self.assertEqual(out.mode, im.mode)
             self.assertEqual(out.size, im.size)
-        for mode in "1", "P", "L", "RGB", "I", "F":
-            copy(mode)
+
+            # Python's copy method
+            im = hopper(mode)
+            out = copy.copy(im)
+            self.assertEqual(out.mode, im.mode)
+            self.assertEqual(out.size, im.size)
+
+            # Internal copy method on a cropped image
+            im = hopper(mode)
+            out = im.crop(croppedCoordinates).copy()
+            self.assertEqual(out.mode, im.mode)
+            self.assertEqual(out.size, croppedSize)
+
+            # Python's copy method on a cropped image
+            im = hopper(mode)
+            out = copy.copy(im.crop(croppedCoordinates))
+            self.assertEqual(out.mode, im.mode)
+            self.assertEqual(out.size, croppedSize)
 
 if __name__ == '__main__':
     unittest.main()