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

A few more etree.fromstring

Browse Source
This commit is contained in:
Kovid Goyal 2019-12-29 22:02:16 +05:30
parent 3932fb8b5a
commit 746381d179
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
7 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
imgsrc/srv/generate.py
View File

@ -7,8 +7,9 @@ import os, re, sys
from lxml import etree
SVG_NS = 'http://www.w3.org/2000/svg'
XLINK_NS = 'http://www.w3.org/1999/xlink'
SVG_NS = 'http://www.w3.org/2000/svg'
XLINK_NS = 'http://www.w3.org/1999/xlink'
def clone_node(node, parent):
ans = parent.makeelement(node.tag)
@ -20,15 +21,26 @@ def clone_node(node, parent):
parent.append(ans)
return ans
def merge():
base = os.path.dirname(os.path.abspath(__file__))
ans = etree.fromstring('<svg xmlns="%s" xmlns:xlink="%s"/>' % (SVG_NS, XLINK_NS))
ans = etree.fromstring(
'<svg xmlns="%s" xmlns:xlink="%s"/>' % (SVG_NS, XLINK_NS),
parser=etree.XMLParser(
recover=True, no_network=True, resolve_entities=False
)
)
for f in os.listdir(base):
if not f.endswith('.svg'):
continue
with open(os.path.join(base, f), 'rb') as ff:
raw = ff.read()
svg = etree.fromstring(raw)
svg = etree.fromstring(
raw,
parser=etree.XMLParser(
recover=True, no_network=True, resolve_entities=False
)
)
symbol = ans.makeelement('{%s}symbol' % SVG_NS)
symbol.set('viewBox', svg.get('viewBox'))
symbol.set('id', 'icon-' + f.rpartition('.')[0])
@ -39,5 +51,6 @@ def merge():
ans = re.sub('<svg[^>]+>', '<svg style="display:none">', ans, count=1)
return ans
if __name__ == '__main__':
sys.stdout.write(merge().encode('utf-8'))

2
recipes/ekathemerini.recipe
View File

@ -42,7 +42,7 @@ class Ekathimerini(BasicNewsRecipe):
def parse_index(self):
idx_contents = self.browser.open(self.rss_url).read()
idx = etree.fromstring(idx_contents)
idx = etree.fromstring(idx_contents, parser=etree.XMLParser(recover=True, no_network=True, resolve_entities=False))
cats = sorted({self.tag_to_string(subcat)
for subcat in idx.xpath('//*[local-name()="subcat"]')})

2
recipes/thecodelesscode.recipe
View File

@ -170,7 +170,7 @@ class CodelessCode(BasicNewsRecipe):
for item in oeb.manifest.hrefs['index.html'].data.xpath('//*[local-name()="div"]'):
for credit in self.credits[::-1]:
item.insert(0, etree.fromstring(credit))
item.insert(0, etree.fromstring(credit, parser=etree.XMLParser(recover=True, no_network=True, resolve_entities=False)))
# Change the creator from "calibre" to the actual author
# Also, we don't need the date in the ebook's title

2
setup/hyphenation.py
View File

@ -26,7 +26,7 @@ def locales_from_dicts(dicts):
def locales_from_xcu(xcu, dicts):
from lxml import etree
with open(xcu, 'rb') as f:
root = etree.fromstring(f.read())
root = etree.fromstring(f.read(), parser=etree.XMLParser(recover=True, no_network=True, resolve_entities=False))
ans = {}
dicts = {os.path.basename(x) for x in dicts}
for value in root.xpath('//*[contains(text(),"DICT_HYPH")]'):

2
src/calibre/test_build.py
View File

@ -108,7 +108,7 @@ class BuildTest(unittest.TestCase):
test_clean_xml_chars()
from lxml import etree
raw = b'<a/>'
root = etree.fromstring(raw)
root = etree.fromstring(raw, parser=etree.XMLParser(recover=True, no_network=True, resolve_entities=False))
self.assertEqual(etree.tostring(root), raw)
def test_certgen(self):

4
src/css_selectors/select.py
View File

@ -687,6 +687,8 @@ default_dispatch_map = {name.partition('_')[2]:obj for name, obj in globals().it
if __name__ == '__main__':
from pprint import pprint
root = etree.fromstring('<body xmlns="xxx" xml:lang="en"><p id="p" class="one two" lang="fr"><a id="a"/><b/><c/><d/></p></body>')
root = etree.fromstring(
'<body xmlns="xxx" xml:lang="en"><p id="p" class="one two" lang="fr"><a id="a"/><b/><c/><d/></p></body>',
parser=etree.XMLParser(recover=True, no_network=True, resolve_entities=False))
select = Select(root, ignore_inappropriate_pseudo_classes=True, trace=True)
pprint(list(select('p:disabled')))

4
src/css_selectors/tests.py
View File

@ -646,7 +646,7 @@ by William Shakespeare
# }}}
def test_select(self): # {{{
document = etree.fromstring(self.HTML_IDS)
document = etree.fromstring(self.HTML_IDS, parser=etree.XMLParser(recover=True, no_network=True, resolve_entities=False))
select = Select(document)
def select_ids(selector):
@ -823,7 +823,7 @@ def run_tests(find_tests=find_tests, for_build=False):
except StopIteration:
pass
if ans is None:
print ('No test named %s found' % args.name)
print('No test named %s found' % args.name)
raise SystemExit(1)
tests = ans
else: