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

DRYer

Browse Source
This commit is contained in:
Kovid Goyal 2019-04-15 14:46:10 +05:30
parent 976a3f9b4a
commit 2a2a08b660
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -396,12 +396,8 @@ def xml2str(root, pretty_print=False, strip_comments=False, with_tail=True):
return ans
def xml2unicode(root, pretty_print=False):
return etree.tostring(root, pretty_print=pretty_print)
def xml2text(elem):
return etree.tostring(elem, method='text', encoding=unicode_type, with_tail=False)
def xml2text(elem, pretty_print=False):
return etree.tostring(elem, method='text', encoding=unicode_type, with_tail=False, pretty_print=pretty_print)
def escape_cdata(root):
@ -1088,7 +1084,7 @@ class Manifest(object):
def unicode_representation(self):
data = self.data
if isinstance(data, etree._Element):
return xml2unicode(data, pretty_print=self.oeb.pretty_print)
return xml2text(data, pretty_print=self.oeb.pretty_print)
if isinstance(data, unicode_type):
return data
if hasattr(data, 'cssText'):