python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-10-31 07:57:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

Renamed __fp to _fp

Browse Source
This commit is contained in:
Andrew Murray 2022-04-13 09:54:17 +10:00
parent 43b423bc25
commit 2ae52552f7
11 changed files with 71 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/PIL/DcxImagePlugin.py
View File

@ -57,7 +57,7 @@ class DcxImageFile(PcxImageFile):
break break
self._offset.append(offset) self._offset.append(offset)
self.__fp = self.fp self._fp = self.fp
self.frame = None self.frame = None
self.n_frames = len(self._offset) self.n_frames = len(self._offset)
self.is_animated = self.n_frames > 1 self.is_animated = self.n_frames > 1
@ -67,21 +67,21 @@ class DcxImageFile(PcxImageFile):
if not self._seek_check(frame): if not self._seek_check(frame):
return return
self.frame = frame self.frame = frame
self.fp = self.__fp self.fp = self._fp
self.fp.seek(self._offset[frame]) self.fp.seek(self._offset[frame])
PcxImageFile._open(self) PcxImageFile._open(self)
def tell(self): def tell(self):
return self.frame return self.frame
def _close__fp(self): def _close_fp(self):
try: try:
if self.__fp != self.fp: if self._fp != self.fp:
self.__fp.close() self._fp.close()
except AttributeError: except AttributeError:
pass pass
finally: finally:
self.__fp = None self._fp = None
Image.register_open(DcxImageFile.format, DcxImageFile, _accept) Image.register_open(DcxImageFile.format, DcxImageFile, _accept)

14
src/PIL/FliImagePlugin.py
View File

@ -91,7 +91,7 @@ class FliImageFile(ImageFile.ImageFile):
# set things up to decode first frame # set things up to decode first frame
self.__frame = -1 self.__frame = -1
self.__fp = self.fp self._fp = self.fp
self.__rewind = self.fp.tell() self.__rewind = self.fp.tell()
self.seek(0) self.seek(0)
@ -125,7 +125,7 @@ class FliImageFile(ImageFile.ImageFile):
def _seek(self, frame): def _seek(self, frame):
if frame == 0: if frame == 0:
self.__frame = -1 self.__frame = -1
self.__fp.seek(self.__rewind) self._fp.seek(self.__rewind)
self.__offset = 128 self.__offset = 128
else: else:
# ensure that the previous frame was loaded # ensure that the previous frame was loaded
@ -136,7 +136,7 @@ class FliImageFile(ImageFile.ImageFile):
self.__frame = frame self.__frame = frame
# move to next frame # move to next frame
self.fp = self.__fp self.fp = self._fp
self.fp.seek(self.__offset) self.fp.seek(self.__offset)
s = self.fp.read(4) s = self.fp.read(4)
@ -153,14 +153,14 @@ class FliImageFile(ImageFile.ImageFile):
def tell(self): def tell(self):
return self.__frame return self.__frame
def _close__fp(self): def _close_fp(self):
try: try:
if self.__fp != self.fp: if self._fp != self.fp:
self.__fp.close() self._fp.close()
except AttributeError: except AttributeError:
pass pass
finally: finally:
self.__fp = None self._fp = None
# #

16
src/PIL/GifImagePlugin.py
View File

@ -102,7 +102,7 @@ class GifImageFile(ImageFile.ImageFile):
p = ImagePalette.raw("RGB", p) p = ImagePalette.raw("RGB", p)
self.global_palette = self.palette = 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.__rewind = self.fp.tell()
self._n_frames = None self._n_frames = None
self._is_animated = None self._is_animated = None
@ -161,7 +161,7 @@ class GifImageFile(ImageFile.ImageFile):
self.__offset = 0 self.__offset = 0
self.dispose = None self.dispose = None
self.__frame = -1 self.__frame = -1
self.__fp.seek(self.__rewind) self._fp.seek(self.__rewind)
self.disposal_method = 0 self.disposal_method = 0
else: else:
# ensure that the previous frame was loaded # ensure that the previous frame was loaded
@ -171,7 +171,7 @@ class GifImageFile(ImageFile.ImageFile):
if frame != self.__frame + 1: if frame != self.__frame + 1:
raise ValueError(f"cannot seek to frame {frame}") raise ValueError(f"cannot seek to frame {frame}")
self.fp = self.__fp self.fp = self._fp
if self.__offset: if self.__offset:
# backup to last frame # backup to last frame
self.fp.seek(self.__offset) self.fp.seek(self.__offset)
@ -281,7 +281,7 @@ class GifImageFile(ImageFile.ImageFile):
s = None s = None
if interlace is None: if interlace is None:
# self.__fp = None # self._fp = None
raise EOFError raise EOFError
if not update_image: if not update_image:
return return
@ -443,14 +443,14 @@ class GifImageFile(ImageFile.ImageFile):
def tell(self): def tell(self):
return self.__frame return self.__frame
def _close__fp(self): def _close_fp(self):
try: try:
if self.__fp != self.fp: if self._fp != self.fp:
self.__fp.close() self._fp.close()
except AttributeError: except AttributeError:
pass pass
finally: finally:
self.__fp = None self._fp = None
# -------------------------------------------------------------------- # --------------------------------------------------------------------

12
src/PIL/ImImagePlugin.py
View File

@ -245,7 +245,7 @@ class ImImageFile(ImageFile.ImageFile):
self.__offset = offs = self.fp.tell() self.__offset = offs = self.fp.tell()
self.__fp = self.fp # FIXME: hack self._fp = self.fp # FIXME: hack
if self.rawmode[:2] == "F;": if self.rawmode[:2] == "F;":
@ -294,21 +294,21 @@ class ImImageFile(ImageFile.ImageFile):
size = ((self.size[0] * bits + 7) // 8) * self.size[1] size = ((self.size[0] * bits + 7) // 8) * self.size[1]
offs = self.__offset + frame * size 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))] self.tile = [("raw", (0, 0) + self.size, offs, (self.rawmode, 0, -1))]
def tell(self): def tell(self):
return self.frame return self.frame
def _close__fp(self): def _close_fp(self):
try: try:
if self.__fp != self.fp: if self._fp != self.fp:
self.__fp.close() self._fp.close()
except AttributeError: except AttributeError:
pass pass
finally: finally:
self.__fp = None self._fp = None
# #

8
src/PIL/Image.py
View File

@ -544,8 +544,8 @@ class Image:
def __exit__(self, *args): def __exit__(self, *args):
if hasattr(self, "fp") and getattr(self, "_exclusive_fp", False): if hasattr(self, "fp") and getattr(self, "_exclusive_fp", False):
if hasattr(self, "_close__fp"): if hasattr(self, "_close_fp"):
self._close__fp() self._close_fp()
if self.fp: if self.fp:
self.fp.close() self.fp.close()
self.fp = None self.fp = None
@ -563,8 +563,8 @@ class Image:
more information. more information.
""" """
try: try:
if hasattr(self, "_close__fp"): if hasattr(self, "_close_fp"):
self._close__fp() self._close_fp()
if self.fp: if self.fp:
self.fp.close() self.fp.close()
self.fp = None self.fp = None

10
src/PIL/MicImagePlugin.py
View File

@ -62,7 +62,7 @@ class MicImageFile(TiffImagePlugin.TiffImageFile):
if not self.images: if not self.images:
raise SyntaxError("not an MIC file; no image entries") raise SyntaxError("not an MIC file; no image entries")
self.__fp = self.fp self._fp = self.fp
self.frame = None self.frame = None
self._n_frames = len(self.images) self._n_frames = len(self.images)
self.is_animated = self._n_frames > 1 self.is_animated = self._n_frames > 1
@ -89,14 +89,14 @@ class MicImageFile(TiffImagePlugin.TiffImageFile):
def tell(self): def tell(self):
return self.frame return self.frame
def _close__fp(self): def _close_fp(self):
try: try:
if self.__fp != self.fp: if self._fp != self.fp:
self.__fp.close() self._fp.close()
except AttributeError: except AttributeError:
pass pass
finally: finally:
self.__fp = None self._fp = None
# #

16
src/PIL/MpoImagePlugin.py
View File

@ -58,20 +58,20 @@ class MpoImageFile(JpegImagePlugin.JpegImageFile):
assert self.n_frames == len(self.__mpoffsets) assert self.n_frames == len(self.__mpoffsets)
del self.info["mpoffset"] # no longer needed del self.info["mpoffset"] # no longer needed
self.is_animated = self.n_frames > 1 self.is_animated = self.n_frames > 1
self.__fp = self.fp # FIXME: hack self._fp = self.fp # FIXME: hack
self.__fp.seek(self.__mpoffsets[0]) # get ready to read first frame self._fp.seek(self.__mpoffsets[0]) # get ready to read first frame
self.__frame = 0 self.__frame = 0
self.offset = 0 self.offset = 0
# for now we can only handle reading and individual frame extraction # for now we can only handle reading and individual frame extraction
self.readonly = 1 self.readonly = 1
def load_seek(self, pos): def load_seek(self, pos):
self.__fp.seek(pos) self._fp.seek(pos)
def seek(self, frame): def seek(self, frame):
if not self._seek_check(frame): if not self._seek_check(frame):
return return
self.fp = self.__fp self.fp = self._fp
self.offset = self.__mpoffsets[frame] self.offset = self.__mpoffsets[frame]
self.fp.seek(self.offset + 2) # skip SOI marker self.fp.seek(self.offset + 2) # skip SOI marker
@ -97,14 +97,14 @@ class MpoImageFile(JpegImagePlugin.JpegImageFile):
def tell(self): def tell(self):
return self.__frame return self.__frame
def _close__fp(self): def _close_fp(self):
try: try:
if self.__fp != self.fp: if self._fp != self.fp:
self.__fp.close() self._fp.close()
except AttributeError: except AttributeError:
pass pass
finally: finally:
self.__fp = None self._fp = None
@staticmethod @staticmethod
def adopt(jpeg_instance, mpheader=None): def adopt(jpeg_instance, mpheader=None):

18
src/PIL/PngImagePlugin.py
View File

@ -689,7 +689,7 @@ class PngImageFile(ImageFile.ImageFile):
if not _accept(self.fp.read(8)): if not _accept(self.fp.read(8)):
raise SyntaxError("not a PNG file") raise SyntaxError("not a PNG file")
self.__fp = self.fp self._fp = self.fp
self.__frame = 0 self.__frame = 0
# #
@ -746,7 +746,7 @@ class PngImageFile(ImageFile.ImageFile):
self._close_exclusive_fp_after_loading = False self._close_exclusive_fp_after_loading = False
self.png.save_rewind() self.png.save_rewind()
self.__rewind_idat = self.__prepare_idat self.__rewind_idat = self.__prepare_idat
self.__rewind = self.__fp.tell() self.__rewind = self._fp.tell()
if self.default_image: if self.default_image:
# IDAT chunk contains default image and not first animation frame # IDAT chunk contains default image and not first animation frame
self.n_frames += 1 self.n_frames += 1
@ -801,7 +801,7 @@ class PngImageFile(ImageFile.ImageFile):
def _seek(self, frame, rewind=False): def _seek(self, frame, rewind=False):
if frame == 0: if frame == 0:
if rewind: if rewind:
self.__fp.seek(self.__rewind) self._fp.seek(self.__rewind)
self.png.rewind() self.png.rewind()
self.__prepare_idat = self.__rewind_idat self.__prepare_idat = self.__rewind_idat
self.im = None self.im = None
@ -809,7 +809,7 @@ class PngImageFile(ImageFile.ImageFile):
self.pyaccess = None self.pyaccess = None
self.info = self.png.im_info self.info = self.png.im_info
self.tile = self.png.im_tile self.tile = self.png.im_tile
self.fp = self.__fp self.fp = self._fp
self._prev_im = None self._prev_im = None
self.dispose = None self.dispose = None
self.default_image = self.info.get("default_image", False) 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.im.paste(self.dispose, self.dispose_extent)
self._prev_im = self.im.copy() self._prev_im = self.im.copy()
self.fp = self.__fp self.fp = self._fp
# advance to the next frame # advance to the next frame
if self.__prepare_idat: if self.__prepare_idat:
@ -1006,14 +1006,14 @@ class PngImageFile(ImageFile.ImageFile):
else {} else {}
) )
def _close__fp(self): def _close_fp(self):
try: try:
if self.__fp != self.fp: if self._fp != self.fp:
self.__fp.close() self._fp.close()
except AttributeError: except AttributeError:
pass pass
finally: finally:
self.__fp = None self._fp = None
# -------------------------------------------------------------------- # --------------------------------------------------------------------

12
src/PIL/PsdImagePlugin.py
View File

@ -132,7 +132,7 @@ class PsdImageFile(ImageFile.ImageFile):
self.tile = _maketile(self.fp, mode, (0, 0) + self.size, channels) self.tile = _maketile(self.fp, mode, (0, 0) + self.size, channels)
# keep the file open # keep the file open
self.__fp = self.fp self._fp = self.fp
self.frame = 1 self.frame = 1
self._min_frame = 1 self._min_frame = 1
@ -146,7 +146,7 @@ class PsdImageFile(ImageFile.ImageFile):
self.mode = mode self.mode = mode
self.tile = tile self.tile = tile
self.frame = layer self.frame = layer
self.fp = self.__fp self.fp = self._fp
return name, bbox return name, bbox
except IndexError as e: except IndexError as e:
raise EOFError("no such layer") from 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 layer number (0=image, 1..max=layers)
return self.frame return self.frame
def _close__fp(self): def _close_fp(self):
try: try:
if self.__fp != self.fp: if self._fp != self.fp:
self.__fp.close() self._fp.close()
except AttributeError: except AttributeError:
pass pass
finally: finally:
self.__fp = None self._fp = None
def _layerinfo(fp, ct_bytes): def _layerinfo(fp, ct_bytes):

12
src/PIL/SpiderImagePlugin.py
View File

@ -149,7 +149,7 @@ class SpiderImageFile(ImageFile.ImageFile):
self.mode = "F" self.mode = "F"
self.tile = [("raw", (0, 0) + self.size, offset, (self.rawmode, 0, 1))] 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 @property
def n_frames(self): def n_frames(self):
@ -172,7 +172,7 @@ class SpiderImageFile(ImageFile.ImageFile):
if not self._seek_check(frame): if not self._seek_check(frame):
return return
self.stkoffset = self.hdrlen + frame * (self.hdrlen + self.imgbytes) self.stkoffset = self.hdrlen + frame * (self.hdrlen + self.imgbytes)
self.fp = self.__fp self.fp = self._fp
self.fp.seek(self.stkoffset) self.fp.seek(self.stkoffset)
self._open() self._open()
@ -191,14 +191,14 @@ class SpiderImageFile(ImageFile.ImageFile):
return ImageTk.PhotoImage(self.convert2byte(), palette=256) return ImageTk.PhotoImage(self.convert2byte(), palette=256)
def _close__fp(self): def _close_fp(self):
try: try:
if self.__fp != self.fp: if self._fp != self.fp:
self.__fp.close() self._fp.close()
except AttributeError: except AttributeError:
pass pass
finally: finally:
self.__fp = None self._fp = None
# -------------------------------------------------------------------- # --------------------------------------------------------------------

12
src/PIL/TiffImagePlugin.py
View File

@ -1073,7 +1073,7 @@ class TiffImageFile(ImageFile.ImageFile):
# setup frame pointers # setup frame pointers
self.__first = self.__next = self.tag_v2.next self.__first = self.__next = self.tag_v2.next
self.__frame = -1 self.__frame = -1
self.__fp = self.fp self._fp = self.fp
self._frame_pos = [] self._frame_pos = []
self._n_frames = None self._n_frames = None
@ -1106,7 +1106,7 @@ class TiffImageFile(ImageFile.ImageFile):
self.im = Image.core.new(self.mode, self.size) self.im = Image.core.new(self.mode, self.size)
def _seek(self, frame): def _seek(self, frame):
self.fp = self.__fp self.fp = self._fp
# reset buffered io handle in case fp # reset buffered io handle in case fp
# was passed to libtiff, invalidating the buffer # was passed to libtiff, invalidating the buffer
@ -1515,14 +1515,14 @@ class TiffImageFile(ImageFile.ImageFile):
self._tile_orientation = self.tag_v2.get(0x0112) self._tile_orientation = self.tag_v2.get(0x0112)
def _close__fp(self): def _close_fp(self):
try: try:
if self.__fp != self.fp: if self._fp != self.fp:
self.__fp.close() self._fp.close()
except AttributeError: except AttributeError:
pass pass
finally: finally:
self.__fp = None self._fp = None
# #