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

Realized that str.replace() won't have the intended effect on UTF-16 (etc) encoded content.

Browse Source
This commit is contained in:
Marshall T. Vandegrift 2009-01-27 00:43:30 -05:00
parent a3bc14fcfa
commit 66042b5512
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/calibre/ebooks/oeb/base.py
View File

@ -334,8 +334,6 @@ class Manifest(object):
# Possibly decode in user-specified encoding # Possibly decode in user-specified encoding
if self.oeb.encoding is not None: if self.oeb.encoding is not None:
data = data.decode(self.oeb.encoding, 'replace') data = data.decode(self.oeb.encoding, 'replace')
# Force to UNIX line encodings
data = data.replace('\r\n', '\n').replace('\r', '\n')
# Handle broken XHTML w/ SVG (ugh) # Handle broken XHTML w/ SVG (ugh)
if 'svg:' in data and SVG_NS not in data: if 'svg:' in data and SVG_NS not in data:
data = data.replace( data = data.replace(
@ -824,7 +822,6 @@ class OEBBook(object):
def _read_opf(self, opfpath): def _read_opf(self, opfpath):
opf = self.container.read(opfpath) opf = self.container.read(opfpath)
opf = opf.replace('\r\n', '\n').replace('\r', '\n')
try: try:
opf = etree.fromstring(opf) opf = etree.fromstring(opf)
except etree.XMLSyntaxError: except etree.XMLSyntaxError: