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

fix python 3.13 breaking more existing code

Browse Source
This commit is contained in:
Kovid Goyal 2024-12-25 07:33:29 +05:30
parent 379e66a321
commit e022decacf
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/calibre/ebooks/metadata/opf2.py
View File

@ -566,6 +566,13 @@ def dump_dict(cats):
return json.dumps(object_to_unicode(cats), ensure_ascii=False, return json.dumps(object_to_unicode(cats), ensure_ascii=False,
skipkeys=True) skipkeys=True)
XPATH_NS = {
'dc': "http://purl.org/dc/elements/1.1/",
'opf': "http://www.idpf.org/2007/opf",
're' : 'http://exslt.org/regular-expressions'
}
XPath = functools.partial(etree.XPath, namespaces=XPATH_NS)
class OPF: # {{{ class OPF: # {{{
@ -576,10 +583,6 @@ class OPF: # {{{
'opf': "http://www.idpf.org/2007/opf", 'opf': "http://www.idpf.org/2007/opf",
} }
META = '{%s}meta' % NAMESPACES['opf'] META = '{%s}meta' % NAMESPACES['opf']
xpn = NAMESPACES.copy()
xpn.pop(None)
xpn['re'] = 'http://exslt.org/regular-expressions'
XPath = functools.partial(etree.XPath, namespaces=xpn)
CONTENT = XPath('self::*[re:match(name(), "meta$", "i")]/@content') CONTENT = XPath('self::*[re:match(name(), "meta$", "i")]/@content')
TEXT = XPath('string()') TEXT = XPath('string()')
@ -729,7 +732,7 @@ class OPF: # {{{
def find_toc(self): def find_toc(self):
self.toc = None self.toc = None
try: try:
spine = self.XPath('descendant::*[re:match(name(), "spine", "i")]')(self.root) spine = XPath('descendant::*[re:match(name(), "spine", "i")]')(self.root)
toc = None toc = None
if spine: if spine:
spine = spine[0] spine = spine[0]
@ -830,7 +833,7 @@ class OPF: # {{{
def replace_spine_items_by_idref(self, idref, new_idrefs): def replace_spine_items_by_idref(self, idref, new_idrefs):
items = list(map(self.create_spine_item, new_idrefs)) items = list(map(self.create_spine_item, new_idrefs))
spine = self.XPath('/opf:package/*[re:match(name(), "spine", "i")]')(self.root)[0] spine = XPath('/opf:package/*[re:match(name(), "spine", "i")]')(self.root)[0]
old = [i for i in self.iterspine() if i.get('idref', None) == idref] old = [i for i in self.iterspine() if i.get('idref', None) == idref]
for x in old: for x in old:
i = spine.index(x) i = spine.index(x)
@ -1025,7 +1028,7 @@ class OPF: # {{{
def get_identifiers(self): def get_identifiers(self):
identifiers = {} identifiers = {}
schemeless = [] schemeless = []
for x in self.XPath( for x in XPath(
'descendant::*[local-name() = "identifier" and text()]')( 'descendant::*[local-name() = "identifier" and text()]')(
self.metadata): self.metadata):
found_scheme = False found_scheme = False
@ -1066,7 +1069,7 @@ class OPF: # {{{
uuid_id = self.root.attrib[attr] uuid_id = self.root.attrib[attr]
break break
for x in self.XPath( for x in XPath(
'descendant::*[local-name() = "identifier"]')( 'descendant::*[local-name() = "identifier"]')(
self.metadata): self.metadata):
xid = x.get('id', None) xid = x.get('id', None)
@ -1204,7 +1207,7 @@ class OPF: # {{{
@property @property
def page_progression_direction(self): def page_progression_direction(self):
spine = self.XPath('descendant::*[re:match(name(), "spine", "i")][1]')(self.root) spine = XPath('descendant::*[re:match(name(), "spine", "i")][1]')(self.root)
if spine: if spine:
for k, v in iteritems(spine[0].attrib): for k, v in iteritems(spine[0].attrib):
if k == 'page-progression-direction' or k.endswith('}page-progression-direction'): if k == 'page-progression-direction' or k.endswith('}page-progression-direction'):
@ -1212,7 +1215,7 @@ class OPF: # {{{
@property @property
def primary_writing_mode(self): def primary_writing_mode(self):
for m in self.XPath('//*[local-name()="meta" and @name="primary-writing-mode" and @content]')(self.root): for m in XPath('//*[local-name()="meta" and @name="primary-writing-mode" and @content]')(self.root):
return m.get('content') return m.get('content')
@property @property