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

Added comments for patch submitted by mete0r_kr, changed version

Browse Source
This commit is contained in:
decalage 2012-07-25 07:15:29 +02:00 committed by Martin Panter
parent bbee2b5b8a
commit ab541b1b4d
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
PIL/OleFileIO.py
View File

@ -6,7 +6,7 @@ OleFileIO_PL:
Microsoft Compound Document File Format), such as Microsoft Office Microsoft Compound Document File Format), such as Microsoft Office
documents, Image Composer and FlashPix files, Outlook messages, ... documents, Image Composer and FlashPix files, Outlook messages, ...
version 0.22 2012-02-16 Philippe Lagadec - http://www.decalage.info version 0.23 2012-07-25 Philippe Lagadec - http://www.decalage.info
Project website: http://www.decalage.info/python/olefileio Project website: http://www.decalage.info/python/olefileio
@ -24,8 +24,8 @@ WARNING: THIS IS (STILL) WORK IN PROGRESS.
""" """
__author__ = "Fredrik Lundh (Secret Labs AB), Philippe Lagadec" __author__ = "Fredrik Lundh (Secret Labs AB), Philippe Lagadec"
__date__ = "2012-02-16" __date__ = "2012-07-25"
__version__ = '0.22' __version__ = '0.23'
#--- LICENSE ------------------------------------------------------------------ #--- LICENSE ------------------------------------------------------------------
@ -109,6 +109,8 @@ __version__ = '0.22'
# 2012-02-16 v0.22 PL: - fixed bug in getproperties, patch by chuckleberryfinn # 2012-02-16 v0.22 PL: - fixed bug in getproperties, patch by chuckleberryfinn
# (https://bitbucket.org/decalage/olefileio_pl/issue/7) # (https://bitbucket.org/decalage/olefileio_pl/issue/7)
# - added close method to OleFileIO (fixed issue #2) # - added close method to OleFileIO (fixed issue #2)
# 2012-07-25 v0.23 PL: - added support for file-like objects (patch by mete0r_kr)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# TODO (for version 1.0): # TODO (for version 1.0):
@ -453,6 +455,7 @@ class _OleStream(StringIO.StringIO):
offset : offset in bytes for the first FAT or MiniFAT sector offset : offset in bytes for the first FAT or MiniFAT sector
sectorsize: size of one sector sectorsize: size of one sector
fat : array/list of sector indexes (FAT or MiniFAT) fat : array/list of sector indexes (FAT or MiniFAT)
filesize : size of OLE file (for debugging)
return : a StringIO instance containing the OLE stream return : a StringIO instance containing the OLE stream
""" """
debug('_OleStream.__init__:') debug('_OleStream.__init__:')
@ -843,14 +846,19 @@ class OleFileIO:
# file-like object # file-like object
self.fp = filename self.fp = filename
else: else:
# string-like object # string-like object: filename of file on disk
#TODO: if larger than 1024 bytes, this could be the actual data => StringIO
self.fp = open(filename, "rb") self.fp = open(filename, "rb")
# old code fails if filename is not a plain string: # old code fails if filename is not a plain string:
#if type(filename) == type(""): #if type(filename) == type(""):
# self.fp = open(filename, "rb") # self.fp = open(filename, "rb")
#else: #else:
# self.fp = filename # self.fp = filename
self.fp.seek(0, 2) # obtain the filesize by using seek and tell, which should work on most
# file-like objects:
#TODO: do it above, using getsize with filename when possible?
#TODO: fix code to fail with clear exception when filesize cannot be obtained
self.fp.seek(0, os.SEEK_END)
try: try:
filesize = self.fp.tell() filesize = self.fp.tell()
finally: finally: