Changed Image size property to be read-only by default

Author: radarhere

Tests/test_image.py

@@ -56,9 +56,8 @@ def test_width_height(self):
         self.assertEqual(im.width, 1)
         self.assertEqual(im.height, 2)
 
-        im.size = (3, 4)
-        self.assertEqual(im.width, 3)
-        self.assertEqual(im.height, 4)
+        with self.assertRaises(AttributeError) as e:
+            im.size = (3, 4)
 
     def test_invalid_image(self):
         if py3:

Tests/test_imagefile.py

@@ -154,7 +154,7 @@ class MockImageFile(ImageFile.ImageFile):
     def _open(self):
         self.rawmode = 'RGBA'
         self.mode = 'RGBA'
-        self.size = (200, 200)
+        self._size = (200, 200)
         self.tile = [("MOCK", (xoff, yoff, xoff+xsize, yoff+ysize), 32, None)]
 
 

src/PIL/BlpImagePlugin.py

@@ -270,7 +270,7 @@ def _read_blp_header(self):
         self._blp_alpha_encoding, = struct.unpack("<b", self.fp.read(1))
         self._blp_mips, = struct.unpack("<b", self.fp.read(1))
 
-        self.size = struct.unpack("<II", self.fp.read(8))
+        self._size = struct.unpack("<II", self.fp.read(8))
 
         if self.magic == b"BLP1":
             # Only present for BLP1

src/PIL/BmpImagePlugin.py

@@ -143,7 +143,7 @@ def _bitmap(self, header=0, offset=0):
                           file_info['header_size'])
         # ------------------ Special case : header is reported 40, which
         # ---------------------- is shorter than real size for bpp >= 16
-        self.size = file_info['width'], file_info['height']
+        self._size = file_info['width'], file_info['height']
         # -------- If color count was not found in the header, compute from bits
         file_info['colors'] = file_info['colors'] if file_info.get('colors', 0) else (1 << file_info['bits'])
         # -------------------------------- Check abnormal values for DOS attacks

src/PIL/BufrStubImagePlugin.py

@@ -47,7 +47,7 @@ def _open(self):
 
         # make something up
         self.mode = "F"
-        self.size = 1, 1
+        self._size = 1, 1
 
         loader = self._load()
         if loader:

src/PIL/CurImagePlugin.py

@@ -63,7 +63,7 @@ def _open(self):
         self._bitmap(i32(m[12:]) + offset)
 
         # patch up the bitmap height
-        self.size = self.size[0], self.size[1]//2
+        self._size = self.size[0], self.size[1]//2
         d, e, o, a = self.tile[0]
         self.tile[0] = d, (0, 0)+self.size, o, a
 

src/PIL/DdsImagePlugin.py

@@ -114,7 +114,7 @@ def _open(self):
         header = BytesIO(header_bytes)
 
         flags, height, width = struct.unpack("<3I", header.read(12))
-        self.size = (width, height)
+        self._size = (width, height)
         self.mode = "RGBA"
 
         pitch, depth, mipmaps = struct.unpack("<3I", header.read(12))

src/PIL/EpsImagePlugin.py

@@ -217,7 +217,7 @@ def _open(self):
         box = None
 
         self.mode = "RGB"
-        self.size = 1, 1  # FIXME: huh?
+        self._size = 1, 1  # FIXME: huh?
 
         #
         # Load EPS header
@@ -244,7 +244,7 @@ def _open(self):
                             # fields should be integers, but some drivers
                             # put floating point values there anyway.
                             box = [int(float(i)) for i in v.split()]
-                            self.size = box[2] - box[0], box[3] - box[1]
+                            self._size = box[2] - box[0], box[3] - box[1]
                             self.tile = [("eps", (0, 0) + self.size, offset,
                                           (length, box))]
                         except Exception:
@@ -293,7 +293,7 @@ def _open(self):
                 except ValueError:
                     break
 
-                self.size = int(x), int(y)
+                self._size = int(x), int(y)
                 return
 
             s = fp.readline().strip('\r\n')
@@ -331,7 +331,7 @@ def load(self, scale=1):
             return
         self.im = Ghostscript(self.tile, self.size, self.fp, scale)
         self.mode = self.im.mode
-        self.size = self.im.size
+        self._size = self.im.size
         self.tile = []
 
     def load_seek(self, *args, **kwargs):

src/PIL/FitsStubImagePlugin.py

@@ -50,7 +50,7 @@ def _open(self):
 
         # make something up
         self.mode = "F"
-        self.size = 1, 1
+        self._size = 1, 1
 
         loader = self._load()
         if loader:

src/PIL/FliImagePlugin.py

@@ -54,7 +54,7 @@ def _open(self):
 
         # image characteristics
         self.mode = "P"
-        self.size = i16(s[8:10]), i16(s[10:12])
+        self._size = i16(s[8:10]), i16(s[10:12])
 
         # animation speed
         duration = i32(s[16:20])