diff --git a/src/PIL/DcxImagePlugin.py b/src/PIL/DcxImagePlugin.py index de21db8f0..d5c748226 100644 --- a/src/PIL/DcxImagePlugin.py +++ b/src/PIL/DcxImagePlugin.py @@ -57,7 +57,7 @@ class DcxImageFile(PcxImageFile): break self._offset.append(offset) - self.__fp = self.fp + self._fp = self.fp self.frame = None self.n_frames = len(self._offset) self.is_animated = self.n_frames > 1 @@ -67,21 +67,21 @@ class DcxImageFile(PcxImageFile): if not self._seek_check(frame): return self.frame = frame - self.fp = self.__fp + self.fp = self._fp self.fp.seek(self._offset[frame]) PcxImageFile._open(self) def tell(self): return self.frame - def _close__fp(self): + def _close_fp(self): try: - if self.__fp != self.fp: - self.__fp.close() + if self._fp != self.fp: + self._fp.close() except AttributeError: pass finally: - self.__fp = None + self._fp = None Image.register_open(DcxImageFile.format, DcxImageFile, _accept) diff --git a/src/PIL/FliImagePlugin.py b/src/PIL/FliImagePlugin.py index ea9503305..7df301904 100644 --- a/src/PIL/FliImagePlugin.py +++ b/src/PIL/FliImagePlugin.py @@ -91,7 +91,7 @@ class FliImageFile(ImageFile.ImageFile): # set things up to decode first frame self.__frame = -1 - self.__fp = self.fp + self._fp = self.fp self.__rewind = self.fp.tell() self.seek(0) @@ -125,7 +125,7 @@ class FliImageFile(ImageFile.ImageFile): def _seek(self, frame): if frame == 0: self.__frame = -1 - self.__fp.seek(self.__rewind) + self._fp.seek(self.__rewind) self.__offset = 128 else: # ensure that the previous frame was loaded @@ -136,7 +136,7 @@ class FliImageFile(ImageFile.ImageFile): self.__frame = frame # move to next frame - self.fp = self.__fp + self.fp = self._fp self.fp.seek(self.__offset) s = self.fp.read(4) @@ -153,14 +153,14 @@ class FliImageFile(ImageFile.ImageFile): def tell(self): return self.__frame - def _close__fp(self): + def _close_fp(self): try: - if self.__fp != self.fp: - self.__fp.close() + if self._fp != self.fp: + self._fp.close() except AttributeError: pass finally: - self.__fp = None + self._fp = None # diff --git a/src/PIL/GifImagePlugin.py b/src/PIL/GifImagePlugin.py index d36d8c61a..cfb6c0355 100644 --- a/src/PIL/GifImagePlugin.py +++ b/src/PIL/GifImagePlugin.py @@ -102,7 +102,7 @@ class GifImageFile(ImageFile.ImageFile): p = ImagePalette.raw("RGB", p) self.global_palette = self.palette = p - self.__fp = self.fp # FIXME: hack + self._fp = self.fp # FIXME: hack self.__rewind = self.fp.tell() self._n_frames = None self._is_animated = None @@ -161,7 +161,7 @@ class GifImageFile(ImageFile.ImageFile): self.__offset = 0 self.dispose = None self.__frame = -1 - self.__fp.seek(self.__rewind) + self._fp.seek(self.__rewind) self.disposal_method = 0 else: # ensure that the previous frame was loaded @@ -171,7 +171,7 @@ class GifImageFile(ImageFile.ImageFile): if frame != self.__frame + 1: raise ValueError(f"cannot seek to frame {frame}") - self.fp = self.__fp + self.fp = self._fp if self.__offset: # backup to last frame self.fp.seek(self.__offset) @@ -281,7 +281,7 @@ class GifImageFile(ImageFile.ImageFile): s = None if interlace is None: - # self.__fp = None + # self._fp = None raise EOFError if not update_image: return @@ -443,14 +443,14 @@ class GifImageFile(ImageFile.ImageFile): def tell(self): return self.__frame - def _close__fp(self): + def _close_fp(self): try: - if self.__fp != self.fp: - self.__fp.close() + if self._fp != self.fp: + self._fp.close() except AttributeError: pass finally: - self.__fp = None + self._fp = None # -------------------------------------------------------------------- diff --git a/src/PIL/ImImagePlugin.py b/src/PIL/ImImagePlugin.py index f7e690b35..3c5739f3d 100644 --- a/src/PIL/ImImagePlugin.py +++ b/src/PIL/ImImagePlugin.py @@ -245,7 +245,7 @@ class ImImageFile(ImageFile.ImageFile): self.__offset = offs = self.fp.tell() - self.__fp = self.fp # FIXME: hack + self._fp = self.fp # FIXME: hack if self.rawmode[:2] == "F;": @@ -294,21 +294,21 @@ class ImImageFile(ImageFile.ImageFile): size = ((self.size[0] * bits + 7) // 8) * self.size[1] offs = self.__offset + frame * size - self.fp = self.__fp + self.fp = self._fp self.tile = [("raw", (0, 0) + self.size, offs, (self.rawmode, 0, -1))] def tell(self): return self.frame - def _close__fp(self): + def _close_fp(self): try: - if self.__fp != self.fp: - self.__fp.close() + if self._fp != self.fp: + self._fp.close() except AttributeError: pass finally: - self.__fp = None + self._fp = None # diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 3c36178bd..16fad61c1 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -544,8 +544,8 @@ class Image: def __exit__(self, *args): if hasattr(self, "fp") and getattr(self, "_exclusive_fp", False): - if hasattr(self, "_close__fp"): - self._close__fp() + if hasattr(self, "_close_fp"): + self._close_fp() if self.fp: self.fp.close() self.fp = None @@ -563,8 +563,8 @@ class Image: more information. """ try: - if hasattr(self, "_close__fp"): - self._close__fp() + if hasattr(self, "_close_fp"): + self._close_fp() if self.fp: self.fp.close() self.fp = None diff --git a/src/PIL/MicImagePlugin.py b/src/PIL/MicImagePlugin.py index 9248b1b65..324c8eff4 100644 --- a/src/PIL/MicImagePlugin.py +++ b/src/PIL/MicImagePlugin.py @@ -62,7 +62,7 @@ class MicImageFile(TiffImagePlugin.TiffImageFile): if not self.images: raise SyntaxError("not an MIC file; no image entries") - self.__fp = self.fp + self._fp = self.fp self.frame = None self._n_frames = len(self.images) self.is_animated = self._n_frames > 1 @@ -89,14 +89,14 @@ class MicImageFile(TiffImagePlugin.TiffImageFile): def tell(self): return self.frame - def _close__fp(self): + def _close_fp(self): try: - if self.__fp != self.fp: - self.__fp.close() + if self._fp != self.fp: + self._fp.close() except AttributeError: pass finally: - self.__fp = None + self._fp = None # diff --git a/src/PIL/MpoImagePlugin.py b/src/PIL/MpoImagePlugin.py index 88c1bfcc5..0d61746b7 100644 --- a/src/PIL/MpoImagePlugin.py +++ b/src/PIL/MpoImagePlugin.py @@ -58,20 +58,20 @@ class MpoImageFile(JpegImagePlugin.JpegImageFile): assert self.n_frames == len(self.__mpoffsets) del self.info["mpoffset"] # no longer needed self.is_animated = self.n_frames > 1 - self.__fp = self.fp # FIXME: hack - self.__fp.seek(self.__mpoffsets[0]) # get ready to read first frame + self._fp = self.fp # FIXME: hack + self._fp.seek(self.__mpoffsets[0]) # get ready to read first frame self.__frame = 0 self.offset = 0 # for now we can only handle reading and individual frame extraction self.readonly = 1 def load_seek(self, pos): - self.__fp.seek(pos) + self._fp.seek(pos) def seek(self, frame): if not self._seek_check(frame): return - self.fp = self.__fp + self.fp = self._fp self.offset = self.__mpoffsets[frame] self.fp.seek(self.offset + 2) # skip SOI marker @@ -97,14 +97,14 @@ class MpoImageFile(JpegImagePlugin.JpegImageFile): def tell(self): return self.__frame - def _close__fp(self): + def _close_fp(self): try: - if self.__fp != self.fp: - self.__fp.close() + if self._fp != self.fp: + self._fp.close() except AttributeError: pass finally: - self.__fp = None + self._fp = None @staticmethod def adopt(jpeg_instance, mpheader=None): diff --git a/src/PIL/PngImagePlugin.py b/src/PIL/PngImagePlugin.py index c939b86e7..313090e8d 100644 --- a/src/PIL/PngImagePlugin.py +++ b/src/PIL/PngImagePlugin.py @@ -689,7 +689,7 @@ class PngImageFile(ImageFile.ImageFile): if not _accept(self.fp.read(8)): raise SyntaxError("not a PNG file") - self.__fp = self.fp + self._fp = self.fp self.__frame = 0 # @@ -746,7 +746,7 @@ class PngImageFile(ImageFile.ImageFile): self._close_exclusive_fp_after_loading = False self.png.save_rewind() self.__rewind_idat = self.__prepare_idat - self.__rewind = self.__fp.tell() + self.__rewind = self._fp.tell() if self.default_image: # IDAT chunk contains default image and not first animation frame self.n_frames += 1 @@ -801,7 +801,7 @@ class PngImageFile(ImageFile.ImageFile): def _seek(self, frame, rewind=False): if frame == 0: if rewind: - self.__fp.seek(self.__rewind) + self._fp.seek(self.__rewind) self.png.rewind() self.__prepare_idat = self.__rewind_idat self.im = None @@ -809,7 +809,7 @@ class PngImageFile(ImageFile.ImageFile): self.pyaccess = None self.info = self.png.im_info self.tile = self.png.im_tile - self.fp = self.__fp + self.fp = self._fp self._prev_im = None self.dispose = None self.default_image = self.info.get("default_image", False) @@ -828,7 +828,7 @@ class PngImageFile(ImageFile.ImageFile): self.im.paste(self.dispose, self.dispose_extent) self._prev_im = self.im.copy() - self.fp = self.__fp + self.fp = self._fp # advance to the next frame if self.__prepare_idat: @@ -1006,14 +1006,14 @@ class PngImageFile(ImageFile.ImageFile): else {} ) - def _close__fp(self): + def _close_fp(self): try: - if self.__fp != self.fp: - self.__fp.close() + if self._fp != self.fp: + self._fp.close() except AttributeError: pass finally: - self.__fp = None + self._fp = None # -------------------------------------------------------------------- diff --git a/src/PIL/PsdImagePlugin.py b/src/PIL/PsdImagePlugin.py index 283219579..3be9aa290 100644 --- a/src/PIL/PsdImagePlugin.py +++ b/src/PIL/PsdImagePlugin.py @@ -132,7 +132,7 @@ class PsdImageFile(ImageFile.ImageFile): self.tile = _maketile(self.fp, mode, (0, 0) + self.size, channels) # keep the file open - self.__fp = self.fp + self._fp = self.fp self.frame = 1 self._min_frame = 1 @@ -146,7 +146,7 @@ class PsdImageFile(ImageFile.ImageFile): self.mode = mode self.tile = tile self.frame = layer - self.fp = self.__fp + self.fp = self._fp return name, bbox except IndexError as e: raise EOFError("no such layer") from e @@ -155,14 +155,14 @@ class PsdImageFile(ImageFile.ImageFile): # return layer number (0=image, 1..max=layers) return self.frame - def _close__fp(self): + def _close_fp(self): try: - if self.__fp != self.fp: - self.__fp.close() + if self._fp != self.fp: + self._fp.close() except AttributeError: pass finally: - self.__fp = None + self._fp = None def _layerinfo(fp, ct_bytes): diff --git a/src/PIL/SpiderImagePlugin.py b/src/PIL/SpiderImagePlugin.py index 1a72f5c04..0a65c286c 100644 --- a/src/PIL/SpiderImagePlugin.py +++ b/src/PIL/SpiderImagePlugin.py @@ -149,7 +149,7 @@ class SpiderImageFile(ImageFile.ImageFile): self.mode = "F" self.tile = [("raw", (0, 0) + self.size, offset, (self.rawmode, 0, 1))] - self.__fp = self.fp # FIXME: hack + self._fp = self.fp # FIXME: hack @property def n_frames(self): @@ -172,7 +172,7 @@ class SpiderImageFile(ImageFile.ImageFile): if not self._seek_check(frame): return self.stkoffset = self.hdrlen + frame * (self.hdrlen + self.imgbytes) - self.fp = self.__fp + self.fp = self._fp self.fp.seek(self.stkoffset) self._open() @@ -191,14 +191,14 @@ class SpiderImageFile(ImageFile.ImageFile): return ImageTk.PhotoImage(self.convert2byte(), palette=256) - def _close__fp(self): + def _close_fp(self): try: - if self.__fp != self.fp: - self.__fp.close() + if self._fp != self.fp: + self._fp.close() except AttributeError: pass finally: - self.__fp = None + self._fp = None # -------------------------------------------------------------------- diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index 000429991..ee737cb59 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -1073,7 +1073,7 @@ class TiffImageFile(ImageFile.ImageFile): # setup frame pointers self.__first = self.__next = self.tag_v2.next self.__frame = -1 - self.__fp = self.fp + self._fp = self.fp self._frame_pos = [] self._n_frames = None @@ -1106,7 +1106,7 @@ class TiffImageFile(ImageFile.ImageFile): self.im = Image.core.new(self.mode, self.size) def _seek(self, frame): - self.fp = self.__fp + self.fp = self._fp # reset buffered io handle in case fp # was passed to libtiff, invalidating the buffer @@ -1515,14 +1515,14 @@ class TiffImageFile(ImageFile.ImageFile): self._tile_orientation = self.tag_v2.get(0x0112) - def _close__fp(self): + def _close_fp(self): try: - if self.__fp != self.fp: - self.__fp.close() + if self._fp != self.fp: + self._fp.close() except AttributeError: pass finally: - self.__fp = None + self._fp = None #