Skip to content

Commit 7e932fb

Browse files
tornariaahesford
authored andcommitted
python3-lxml: update to 4.9.3, patch for Cython 3
1 parent 3256b05 commit 7e932fb

File tree

4 files changed

+75
-0
lines changed

4 files changed

+75
-0
lines changed
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
diff --git a/src/lxml/tests/test_errors.py b/src/lxml/tests/test_errors.py
2+
index c0aee744..4875f298 100644
3+
--- a/src/lxml/tests/test_errors.py
4+
+++ b/src/lxml/tests/test_errors.py
5+
@@ -28,7 +28,6 @@ class ErrorTestCase(HelperTestCase):
6+
def test_element_cyclic_gc_none(self):
7+
# test if cyclic reference can crash etree
8+
Element = self.etree.Element
9+
- getrefcount = sys.getrefcount
10+
11+
# must disable tracing as it could change the refcounts
12+
trace_func = sys.gettrace()
13+
@@ -36,16 +35,16 @@ class ErrorTestCase(HelperTestCase):
14+
sys.settrace(None)
15+
gc.collect()
16+
17+
- count = getrefcount(None)
18+
+ count1 = gc.get_count()
19+
20+
l = [Element('name'), Element('name')]
21+
l.append(l)
22+
23+
del l
24+
gc.collect()
25+
- count = getrefcount(None) - count
26+
+ count2 = gc.get_count()
27+
28+
- self.assertEqual(count, 0)
29+
+ self.assertEqual(count1, count2)
30+
finally:
31+
sys.settrace(trace_func)
32+
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/setupinfo.py b/setupinfo.py
2+
index 5feb13bf..ea1b391c 100644
3+
--- a/setupinfo.py
4+
+++ b/setupinfo.py
5+
@@ -148,6 +148,7 @@ def ext_modules(static_include_dirs, static_library_dirs,
6+
7+
cythonize_directives = {
8+
'binding': True,
9+
+ 'legacy_implicit_noexcept': True,
10+
}
11+
if OPTION_WITH_COVERAGE:
12+
cythonize_directives['linetrace'] = True
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
From alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/main/py3-lxml
2+
3+
the find above returns None with this version
4+
--
5+
diff --git a/src/lxml/tests/test_etree.py b/src/lxml/tests/test_etree.py
6+
index 0339796..790c57a 100644
7+
--- a/src/lxml/tests/test_etree.py
8+
+++ b/src/lxml/tests/test_etree.py
9+
@@ -3073,7 +3073,7 @@ class ETreeOnlyTestCase(HelperTestCase):
10+
if etree.LIBXML_VERSION < (2, 9, 11):
11+
self.assertEqual({'hha': None}, el.nsmap)
12+
else:
13+
- self.assertEqual({}, el.nsmap)
14+
+ self.assertEqual(None, el)
15+
16+
def test_getchildren(self):
17+
Element = self.etree.Element
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
From alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/main/py3-lxml
2+
3+
diff --git a/src/lxml/tests/test_io.py b/src/lxml/tests/test_io.py
4+
index cbdbcef..efbd3fd 100644
5+
--- a/src/lxml/tests/test_io.py
6+
+++ b/src/lxml/tests/test_io.py
7+
@@ -312,6 +312,7 @@ class _IOTestCaseBase(HelperTestCase):
8+
self.assertEqual(5, len(boms))
9+
xml = uxml.encode("utf-16")
10+
self.assertTrue(xml[:2] in boms, repr(xml[:2]))
11+
+ return True
12+
13+
f = tempfile.NamedTemporaryFile(delete=False)
14+
try:

0 commit comments

Comments
 (0)