Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 10:44:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow passing in bytestrings as replacements, not just file like objects

Browse Source
This commit is contained in:
Kovid Goyal 2016-06-16 08:17:47 +05:30
parent ca2d3986cd
commit cde906b936
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/utils/zipfile.py
View File

@ -1476,7 +1476,10 @@ def safe_replace(zipstream, name, datastream, extra_replacements={},
if isinstance(obj.filename, unicode): if isinstance(obj.filename, unicode):
obj.flag_bits |= 0x16 # Set isUTF-8 bit obj.flag_bits |= 0x16 # Set isUTF-8 bit
if obj.filename in names: if obj.filename in names:
ztemp.writestr(obj, replacements[obj.filename].read()) r = replacements[obj.filename]
if not isinstance(r, bytes):
r = r.read()
ztemp.writestr(obj, r)
found.add(obj.filename) found.add(obj.filename)
else: else:
ztemp.writestr(obj, z.read_raw(obj), raw_bytes=True) ztemp.writestr(obj, z.read_raw(obj), raw_bytes=True)