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 #2048475 [Tests fail with lxml 5.0](https://bugs.launchpad.net/calibre/+bug/2048475)

Browse Source
This commit is contained in:
Kovid Goyal 2024-01-08 09:12:35 +05:30
parent 140ea63f8c
commit e9cc00560a
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/calibre/utils/xml_parse.py
View File

@ -36,6 +36,11 @@ def safe_xml_fromstring(string_or_bytes, recover=True):
return ans return ans
def unsafe_xml_fromstring(string_or_bytes):
parser = etree.XMLParser(resolve_entities=True)
return fs(string_or_bytes, parser=parser)
def find_tests(): def find_tests():
import unittest, tempfile, os import unittest, tempfile, os
from calibre.constants import iswindows from calibre.constants import iswindows
@ -61,7 +66,7 @@ def find_tests():
raw = templ.format(id=tid, val=val) raw = templ.format(id=tid, val=val)
err = None err = None
try: try:
root = safe_xml_fromstring(raw) if safe else etree.fromstring(raw) root = safe_xml_fromstring(raw) if safe else unsafe_xml_fromstring(raw)
except Exception as e: except Exception as e:
err = str(e) err = str(e)
root = None root = None