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

OleFileIO: Port to Python 3

Browse Source
This commit is contained in:
Martin Panter 2014-01-17 04:44:58 +00:00
parent bb449f30ec
commit f4d081953b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PIL/OleFileIO.py
View File

@ -368,7 +368,7 @@ class OleFileIO:
self.root.dump() self.root.dump()
def _clsid(self, clsid): def _clsid(self, clsid):
if clsid == "\0" * len(clsid): if not clsid.strip(b"\0"):
return "" return ""
return (("%08X-%04X-%04X-%02X%02X-" + "%02X" * 6) % return (("%08X-%04X-%04X-%02X%02X-" + "%02X" * 6) %
((i32(clsid, 0), i16(clsid, 4), i16(clsid, 6)) + ((i32(clsid, 0), i16(clsid, 4), i16(clsid, 6)) +
@ -454,7 +454,7 @@ class OleFileIO:
fp.seek(i32(s, 16)) fp.seek(i32(s, 16))
# get section # get section
s = "****" + fp.read(i32(fp.read(4))-4) s = b"****" + fp.read(i32(fp.read(4))-4)
for i in range(i32(s, 4)): for i in range(i32(s, 4)):