commit: 1ccc4c73c59d0f0518771a3dd79a4163db75fac3
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 25 05:11:59 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Oct 25 05:54:12 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ccc4c73
dev-python/lxml: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/lxml/Manifest | 1 -
dev-python/lxml/files/lxml-4.6.0-tests-pypy.patch | 452 ---------------------
.../lxml-4.9.2-py3.12-backport-unicode-fix.patch | 33 --
.../lxml-4.9.2-py3.12-drop-deprecated-imp.patch | 49 ---
dev-python/lxml/lxml-4.9.2-r1.ebuild | 116 ------
dev-python/lxml/lxml-4.9.2.ebuild | 115 ------
dev-python/lxml/lxml-4.9.3.ebuild | 114 ------
7 files changed, 880 deletions(-)
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index a58f79e32b3b..a90d7b0650ac 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,4 +1,3 @@
-DIST lxml-4.9.2.gh.tar.gz 957365 BLAKE2B
201b3977da90386e413f1b89a4b7ee1e44d6bbea05e622e92feb1d67c637ce46ebf746f0648f034ed3bccd609233ccf7d8a7ee456f13b8d9ca8587ddf1ebd32a
SHA512
816b2fe2eef2a97a0df66cbc39850c6dc3d6470e4033cc73edb40c80c0afbbe6c084d042d7c98b29497926e76f648caa42e1ebe5d83060af08af6972316077b0
DIST lxml-4.9.3-patches-2.tar.xz 24288 BLAKE2B
47b7c486a1c1616c875111bd53b14d4211a1eee3f412985f4022e71b85b087abd71d36919fb025257f17de404329284898ddc639f85e8b15ade21778fa218d98
SHA512
713172b4c907db6479a0a803a842824825b212a9b645c1ca356f793658bd6c63113ea248278e7c46b512e22e3130696e9fc5127fea82a67372d920733fc160b0
DIST lxml-4.9.3-patches.tar.xz 10544 BLAKE2B
407938d2f701400e919110c3bfe84e94621f39f8178850c466d41549ee0eff4f23e93cdd8ea684713e8276acfaa05d6f7b7af4d375c859b9fc5b2981d60983a3
SHA512
c2d5d2ffb035aed6d846de84885b87142b2be7a09ffe6927e7c032acab343730acfcbefd75e8141cf3b41b308c532869a7878b515f3d4eeefa7526a3d2599398
DIST lxml-4.9.3.gh.tar.gz 958628 BLAKE2B
ffdf3fe781a03815f7c026229d313721c93375ebafad9b4a20c5d8a380a631401e546d8701a94d8c49615fb6a71e84940d8ca0299b47a37c1c9596db36659113
SHA512
903bd4935c7708b459aee9befcf3f6e3e3aaa9adc122591ea923b6e3d8fd288f07cab3f5f0edb08e3bf9db80414324f0a1a8e5a5089f9cda82f6c50f5df59423
diff --git a/dev-python/lxml/files/lxml-4.6.0-tests-pypy.patch
b/dev-python/lxml/files/lxml-4.6.0-tests-pypy.patch
deleted file mode 100644
index 51bcb8fe2e22..000000000000
--- a/dev-python/lxml/files/lxml-4.6.0-tests-pypy.patch
+++ /dev/null
@@ -1,452 +0,0 @@
-From 1804702b5e3c85c1a16014d62365a29d0a6d0c75 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgo...@gentoo.org>
-Date: Thu, 30 Jan 2020 06:15:27 +0100
-Subject: [PATCH] Skip tests failing on PyPy
-
----
- src/lxml/tests/test_elementtree.py | 3 +-
- src/lxml/tests/test_errors.py | 3 +-
- src/lxml/tests/test_http_io.py | 3 +-
- src/lxml/tests/test_nsclasses.py | 3 +-
- src/lxml/tests/test_objectify.py | 41 +++++++++++++++++++++++++--
- src/lxml/tests/test_xpathevaluator.py | 7 +++--
- src/lxml/tests/test_xslt.py | 7 +++--
- 7 files changed, 56 insertions(+), 11 deletions(-)
-
-diff --git a/src/lxml/tests/test_elementtree.py
b/src/lxml/tests/test_elementtree.py
-index 78d8964d..f3f28044 100644
---- a/src/lxml/tests/test_elementtree.py
-+++ b/src/lxml/tests/test_elementtree.py
-@@ -26,7 +26,7 @@ from .common_imports import (
- BytesIO, etree, HelperTestCase,
- ElementTree, cElementTree, ET_VERSION, CET_VERSION,
- filter_by_version, fileInTestDir, canonicalize, tmpfile,
-- _str, _bytes, unicode, IS_PYTHON2
-+ _str, _bytes, unicode, IS_PYTHON2, IS_PYPY
- )
-
- if cElementTree is not None and (CET_VERSION <= (1,0,7) or
sys.version_info[0] >= 3):
-@@ -2956,6 +2956,7 @@ class _ETreeTestCaseBase(HelperTestCase):
- self.assertEqual('TEST', root2[0].get('{%s}a' % ns_href))
-
- required_versions_ET['test_register_namespace'] = (1,3)
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_register_namespace(self):
- # ET 1.3+
- Element = self.etree.Element
-diff --git a/src/lxml/tests/test_errors.py b/src/lxml/tests/test_errors.py
-index c0aee744..33111429 100644
---- a/src/lxml/tests/test_errors.py
-+++ b/src/lxml/tests/test_errors.py
-@@ -11,7 +11,7 @@ import unittest
- import sys, gc, os.path
- from lxml import etree
-
--from .common_imports import HelperTestCase
-+from .common_imports import HelperTestCase, IS_PYPY
-
-
- class ErrorTestCase(HelperTestCase):
-@@ -25,6 +25,7 @@ class ErrorTestCase(HelperTestCase):
- def test_empty_parse(self):
- self.assertRaises(etree.XMLSyntaxError, etree.fromstring, '')
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_element_cyclic_gc_none(self):
- # test if cyclic reference can crash etree
- Element = self.etree.Element
-diff --git a/src/lxml/tests/test_http_io.py b/src/lxml/tests/test_http_io.py
-index f9eff39a..edf2bd81 100644
---- a/src/lxml/tests/test_http_io.py
-+++ b/src/lxml/tests/test_http_io.py
-@@ -11,10 +11,11 @@ import textwrap
- import sys
- import gzip
-
--from .common_imports import etree, HelperTestCase, BytesIO, _bytes
-+from .common_imports import etree, HelperTestCase, BytesIO, _bytes, IS_PYPY
- from .dummy_http_server import webserver, HTTPRequestCollector
-
-
-+@unittest.skipIf(IS_PYPY, "broken on pypy")
- class HttpIOTestCase(HelperTestCase):
- etree = etree
-
-diff --git a/src/lxml/tests/test_nsclasses.py
b/src/lxml/tests/test_nsclasses.py
-index a0aa608d..5aa5dc48 100644
---- a/src/lxml/tests/test_nsclasses.py
-+++ b/src/lxml/tests/test_nsclasses.py
-@@ -9,7 +9,7 @@ from __future__ import absolute_import
-
- import unittest
-
--from .common_imports import etree, HelperTestCase, _bytes, make_doctest
-+from .common_imports import etree, HelperTestCase, _bytes, make_doctest,
IS_PYPY
-
- class ETreeNamespaceClassesTestCase(HelperTestCase):
-
-@@ -46,6 +46,7 @@ class ETreeNamespaceClassesTestCase(HelperTestCase):
- self.Namespace('ns02').clear()
- self.Namespace('ns03').clear()
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_ns_classes(self):
- bluff_dict = {'bluff' : self.bluff_class}
- maeh_dict = {'maeh' : self.maeh_class}
-diff --git a/src/lxml/tests/test_objectify.py
b/src/lxml/tests/test_objectify.py
-index a12ae7e1..83ba4ced 100644
---- a/src/lxml/tests/test_objectify.py
-+++ b/src/lxml/tests/test_objectify.py
-@@ -9,7 +9,8 @@ from __future__ import absolute_import
- import unittest, operator
-
- from .common_imports import (
-- etree, HelperTestCase, fileInTestDir, doctest, make_doctest, _bytes,
_str, BytesIO
-+ etree, HelperTestCase, fileInTestDir, doctest, make_doctest, _bytes,
_str, BytesIO,
-+ IS_PYPY
- )
-
- from lxml import objectify
-@@ -213,11 +214,13 @@ class ObjectifyTestCase(HelperTestCase):
- expected.update(DEFAULT_NSMAP)
- self.assertEqual(root.value.nsmap, expected)
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_date_element_efactory_text(self):
- # ObjectifiedDataElement can also be used as E-Factory
- value = objectify.ObjectifiedDataElement('test', 'toast')
- self.assertEqual(value.text, 'testtoast')
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_date_element_efactory_tail(self):
- # ObjectifiedDataElement can also be used as E-Factory
- value =
objectify.ObjectifiedElement(objectify.ObjectifiedDataElement(), 'test',
'toast')
-@@ -374,6 +377,7 @@ class ObjectifyTestCase(HelperTestCase):
- self.assertEqual("4", getattr(root.c1, "{}c2").text)
- self.assertEqual("0", getattr(root.c1, "c2").text)
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_setattr(self):
- for val in [
- 2, 2**32, 1.2, "Won't get fooled again",
-@@ -809,6 +813,7 @@ class ObjectifyTestCase(HelperTestCase):
- self.assertEqual(3, len(root.findall(".//b")))
- self.assertEqual(2, len(root.findall("b")))
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_build_tree(self):
- root = self.Element('root')
- root.a = 5
-@@ -838,6 +843,7 @@ class ObjectifyTestCase(HelperTestCase):
- self.assertEqual(value, None)
- self.assertEqual(value.get(XML_SCHEMA_NIL_ATTR), "true")
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_type_bool(self):
- Element = self.Element
- SubElement = self.etree.SubElement
-@@ -871,6 +877,7 @@ class ObjectifyTestCase(HelperTestCase):
- self.assertTrue(isinstance(value, objectify.BoolElement))
- self.assertEqual(value, False)
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_type_str(self):
- Element = self.Element
- SubElement = self.etree.SubElement
-@@ -878,6 +885,7 @@ class ObjectifyTestCase(HelperTestCase):
- root.s = "test"
- self.assertTrue(isinstance(root.s, objectify.StringElement))
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_type_str_intliteral(self):
- Element = self.Element
- SubElement = self.etree.SubElement
-@@ -885,6 +893,7 @@ class ObjectifyTestCase(HelperTestCase):
- root.s = "3"
- self.assertTrue(isinstance(root.s, objectify.StringElement))
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_type_str_floatliteral(self):
- Element = self.Element
- SubElement = self.etree.SubElement
-@@ -892,6 +901,7 @@ class ObjectifyTestCase(HelperTestCase):
- root.s = "3.72"
- self.assertTrue(isinstance(root.s, objectify.StringElement))
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_type_str_mul(self):
- Element = self.Element
- SubElement = self.etree.SubElement
-@@ -904,6 +914,7 @@ class ObjectifyTestCase(HelperTestCase):
- self.assertRaises(TypeError, operator.mul, root.s, "honk")
- self.assertRaises(TypeError, operator.mul, "honk", root.s)
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_type_str_add(self):
- Element = self.Element
- SubElement = self.etree.SubElement
-@@ -914,6 +925,7 @@ class ObjectifyTestCase(HelperTestCase):
- self.assertEqual("test" + s, root.s + s)
- self.assertEqual(s + "test", s + root.s)
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_type_str_mod(self):
- s = "%d %f %s %r"
- el = objectify.DataElement(s)
-@@ -979,6 +991,7 @@ class ObjectifyTestCase(HelperTestCase):
- self.assertTrue(isinstance(value, objectify.StringElement))
- self.assertEqual(value, "3.20")
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_type_ustr(self):
- Element = self.Element
- SubElement = self.etree.SubElement
-@@ -986,6 +999,7 @@ class ObjectifyTestCase(HelperTestCase):
- root.s = _str("test")
- self.assertTrue(isinstance(root.s, objectify.StringElement))
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_type_ustr_intliteral(self):
- Element = self.Element
- SubElement = self.etree.SubElement
-@@ -993,6 +1007,7 @@ class ObjectifyTestCase(HelperTestCase):
- root.s = _str("3")
- self.assertTrue(isinstance(root.s, objectify.StringElement))
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_type_ustr_floatliteral(self):
- Element = self.Element
- SubElement = self.etree.SubElement
-@@ -1000,6 +1015,7 @@ class ObjectifyTestCase(HelperTestCase):
- root.s = _str("3.72")
- self.assertTrue(isinstance(root.s, objectify.StringElement))
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_type_ustr_mul(self):
- Element = self.Element
- SubElement = self.etree.SubElement
-@@ -1012,6 +1028,7 @@ class ObjectifyTestCase(HelperTestCase):
- self.assertRaises(TypeError, operator.mul, root.s, _str("honk"))
- self.assertRaises(TypeError, operator.mul, _str("honk"), root.s)
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_type_ustr_add(self):
- Element = self.Element
- SubElement = self.etree.SubElement
-@@ -1037,6 +1054,7 @@ class ObjectifyTestCase(HelperTestCase):
- self.assertTrue(isinstance(value, objectify.StringElement))
- self.assertEqual(value, _str("3.20"))
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_type_int(self):
- Element = self.Element
- root = Element("{objectified}root")
-@@ -1053,6 +1071,7 @@ class ObjectifyTestCase(HelperTestCase):
- value = objectify.DataElement(123)
- self.assertEqual(hash(value), hash(123))
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_type_float(self):
- Element = self.Element
- SubElement = self.etree.SubElement
-@@ -1069,6 +1088,7 @@ class ObjectifyTestCase(HelperTestCase):
- value = objectify.DataElement(5.5)
- self.assertEqual(hash(value), hash(5.5))
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_type_float_precision(self):
- # test not losing precision by shortened float str() value
- # repr(2.305064300557): '2.305064300557'
-@@ -1088,6 +1108,7 @@ class ObjectifyTestCase(HelperTestCase):
- s = "2.305064300557"
- self.assertEqual(objectify.FloatElement(s), float(s))
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_type_float_precision_consistency(self):
- # test consistent FloatElement values for the different instantiation
- # possibilities
-@@ -1169,6 +1190,7 @@ class ObjectifyTestCase(HelperTestCase):
- self.assertEqual(value.text, None)
- self.assertEqual(value.pyval, None)
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_type_unregistered(self):
- Element = self.Element
- SubElement = self.etree.SubElement
-@@ -1331,6 +1353,7 @@ class ObjectifyTestCase(HelperTestCase):
- self.assertEqual(["why", "try"],
- strs)
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_type_str_cmp(self):
- XML = self.XML
- root = XML(_bytes('<root><b>test</b><b>taste</b><b></b><b/></root>'))
-@@ -1358,6 +1381,7 @@ class ObjectifyTestCase(HelperTestCase):
- self.assertEqual(root.b, "")
- self.assertEqual("", root.b)
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_type_int_cmp(self):
- XML = self.XML
- root = XML(_bytes('<root><b>5</b><b>6</b></root>'))
-@@ -1380,6 +1404,7 @@ class ObjectifyTestCase(HelperTestCase):
-
- # float + long share the NumberElement implementation with int
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_type_bool_cmp(self):
- XML = self.XML
- root = XML(_bytes('<root><b>false</b><b>true</b></root>'))
-@@ -2049,6 +2074,7 @@ class ObjectifyTestCase(HelperTestCase):
- before = [objectify.getRegisteredTypes()[0].name],
- after = [objectify.getRegisteredTypes()[1].name])
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_registered_type_stringify(self):
- from datetime import datetime
- def parse_date(value):
-@@ -2519,46 +2545,55 @@ class ObjectifyTestCase(HelperTestCase):
-
- # E-Factory tests, need to use sub-elements as root element is always
- # type-looked-up as ObjectifiedElement (no annotations)
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_efactory_int(self):
- E = objectify.E
- root = E.root(E.val(23))
- self.assertTrue(isinstance(root.val, objectify.IntElement))
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_efactory_float(self):
- E = objectify.E
- root = E.root(E.val(233.23))
- self.assertTrue(isinstance(root.val, objectify.FloatElement))
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_efactory_str(self):
- E = objectify.E
- root = E.root(E.val("what?"))
- self.assertTrue(isinstance(root.val, objectify.StringElement))
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_efactory_unicode(self):
- E = objectify.E
- root = E.root(E.val(_str("blöödy häll", encoding="ISO-8859-1")))
- self.assertTrue(isinstance(root.val, objectify.StringElement))
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_efactory_bool(self):
- E = objectify.E
- root = E.root(E.val(True))
- self.assertTrue(isinstance(root.val, objectify.BoolElement))
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_efactory_none(self):
- E = objectify.E
- root = E.root(E.val(None))
- self.assertTrue(isinstance(root.val, objectify.NoneElement))
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_efactory_value_concatenation(self):
- E = objectify.E
- root = E.root(E.val(1, "foo", 2.0, "bar ", True, None))
- self.assertTrue(isinstance(root.val, objectify.StringElement))
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_efactory_attrib(self):
- E = objectify.E
- root = E.root(foo="bar")
- self.assertEqual(root.get("foo"), "bar")
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_efactory_nested(self):
- E = objectify.E
- DataElement = objectify.DataElement
-@@ -2573,6 +2608,7 @@ class ObjectifyTestCase(HelperTestCase):
- self.assertTrue(isinstance(root.value[0], objectify.IntElement))
- self.assertTrue(isinstance(root.value[1], objectify.FloatElement))
-
-+ @unittest.skipIf(IS_PYPY, "broken on pypy")
- def test_efactory_subtype(self):
- class Attribute(objectify.ObjectifiedDataElement):
- def __init__(self):
-@@ -2674,7 +2710,8 @@ def test_suite():
- suite = unittest.TestSuite()
- suite.addTests([unittest.makeSuite(ObjectifyTestCase)])
- suite.addTests(doctest.DocTestSuite(objectify))
-- suite.addTests([make_doctest('../../../doc/objectify.txt')])
-+ if not IS_PYPY:
-+ suite.addTests([make_doctest('../../../doc/objectify.txt')])
- return suite
-
- if __name__ == '__main__':
-diff --git a/src/lxml/tests/test_xpathevaluator.py
b/src/lxml/tests/test_xpathevaluator.py
-index 13ee97ec..6d162c6d 100644
---- a/src/lxml/tests/test_xpathevaluator.py
-+++ b/src/lxml/tests/test_xpathevaluator.py
-@@ -8,7 +8,7 @@ from __future__ import absolute_import
-
- import unittest, sys
-
--from .common_imports import etree, HelperTestCase, _bytes, BytesIO, doctest,
make_doctest
-+from .common_imports import etree, HelperTestCase, _bytes, BytesIO, doctest,
make_doctest, IS_PYPY
-
-
- class ETreeXPathTestCase(HelperTestCase):
-@@ -740,8 +740,9 @@ def test_suite():
- suite.addTests([unittest.makeSuite(ETreeXPathExsltTestCase)])
- suite.addTests([unittest.makeSuite(ETreeETXPathClassTestCase)])
- suite.addTests([doctest.DocTestSuite()])
-- suite.addTests(
-- [make_doctest('../../../doc/xpathxslt.txt')])
-+ if not IS_PYPY:
-+ suite.addTests(
-+ [make_doctest('../../../doc/xpathxslt.txt')])
- return suite
-
- if __name__ == '__main__':
-diff --git a/src/lxml/tests/test_xslt.py b/src/lxml/tests/test_xslt.py
-index cde23357..41f8d78b 100644
---- a/src/lxml/tests/test_xslt.py
-+++ b/src/lxml/tests/test_xslt.py
-@@ -17,6 +17,8 @@ from textwrap import dedent
- from tempfile import NamedTemporaryFile, mkdtemp
-
- is_python3 = sys.version_info[0] >= 3
-+is_pypy = (getattr(sys, 'implementation', None) == 'pypy' or
-+ getattr(sys, 'pypy_version_info', None) is not None)
-
- try:
- unicode
-@@ -2085,8 +2087,9 @@ def test_suite():
- suite.addTests([unittest.makeSuite(Py3XSLTTestCase)])
- suite.addTests(
- [make_doctest('../../../doc/extensions.txt')])
-- suite.addTests(
-- [make_doctest('../../../doc/xpathxslt.txt')])
-+ if not is_pypy:
-+ suite.addTests(
-+ [make_doctest('../../../doc/xpathxslt.txt')])
- return suite
-
- if __name__ == '__main__':
---
-2.25.0
-
-diff --git a/doc/element_classes.txt b/doc/element_classes.txt
-index 4b1e72e8..fda9ea07 100644
---- a/doc/element_classes.txt
-+++ b/doc/element_classes.txt
-@@ -576,10 +576,10 @@ subclasses for elements of this namespace:
-
- >>> print(honk_element[0].honk())
- HONK
-- >>> print(honk_element[0].honking)
-+ >>> print(honk_element[0].honking) # doctest: +ELLIPSIS
- Traceback (most recent call last):
- ...
-- AttributeError: 'HonkNSElement' object has no attribute 'honking'
-+ AttributeError: 'HonkNSElement' object has no attribute 'honking'...
-
- >>> print(honk_element[1].text) # uses fallback for non-elements
- comment
-
diff --git a/dev-python/lxml/files/lxml-4.9.2-py3.12-backport-unicode-fix.patch
b/dev-python/lxml/files/lxml-4.9.2-py3.12-backport-unicode-fix.patch
deleted file mode 100644
index d1ca31d1b909..000000000000
--- a/dev-python/lxml/files/lxml-4.9.2-py3.12-backport-unicode-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream:
https://github.com/lxml/lxml/commit/a1f2231dfdd31a37f2c55bc9ae4ac33e92221227
-
-From a1f2231dfdd31a37f2c55bc9ae4ac33e92221227 Mon Sep 17 00:00:00 2001
-From: Stefan Behnel <stefan...@behnel.de>
-Date: Fri, 12 May 2023 09:49:34 +0200
-Subject: [PATCH] Adapt unicode parsing to Py3.12.
-
----
- src/lxml/includes/etree_defs.h | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/src/lxml/includes/etree_defs.h b/src/lxml/includes/etree_defs.h
-index e671fa85d..d42f2158c 100644
---- a/src/lxml/includes/etree_defs.h
-+++ b/src/lxml/includes/etree_defs.h
-@@ -120,6 +120,16 @@ static PyObject* PyBytes_FromFormat(const char* format,
...) {
- # define _lx_PySlice_GetIndicesEx(o, l, b, e, s, sl)
PySlice_GetIndicesEx(((PySliceObject*)o), l, b, e, s, sl)
- #endif
-
-+#if PY_VERSION_HEX >= 0x030B00A1
-+/* Python 3.12 doesn't have wstr Unicode strings any more. */
-+#undef PyUnicode_GET_DATA_SIZE
-+#define PyUnicode_GET_DATA_SIZE(ustr) (0)
-+#undef PyUnicode_AS_DATA
-+#define PyUnicode_AS_DATA(ustr) (NULL)
-+#undef PyUnicode_IS_READY
-+#define PyUnicode_IS_READY(ustr) (1)
-+#endif
-+
- #ifdef WITHOUT_THREADING
- # undef PyEval_SaveThread
- # define PyEval_SaveThread() (NULL)
-
diff --git a/dev-python/lxml/files/lxml-4.9.2-py3.12-drop-deprecated-imp.patch
b/dev-python/lxml/files/lxml-4.9.2-py3.12-drop-deprecated-imp.patch
deleted file mode 100644
index a59a60e74822..000000000000
--- a/dev-python/lxml/files/lxml-4.9.2-py3.12-drop-deprecated-imp.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-https://github.com/lxml/lxml/commit/07db761f9f027d1814a43686cda6fca26e37a931
-https://github.com/lxml/lxml/commit/c6b7e621e4696c02bf8f6ea423ffbbf2109748ab
-
-From 07db761f9f027d1814a43686cda6fca26e37a931 Mon Sep 17 00:00:00 2001
-From: Stefan Behnel <stefan...@behnel.de>
-Date: Thu, 11 May 2023 10:29:02 +0200
-Subject: [PATCH] Avoid using the deprecated "imp" module.
-
-Closes https://bugs.launchpad.net/lxml/+bug/2018137
---- a/src/lxml/html/tests/test_html5parser.py
-+++ b/src/lxml/html/tests/test_html5parser.py
-@@ -1,5 +1,4 @@
- import os
--import imp
- try:
- from StringIO import StringIO
- except ImportError: # python 3
-@@ -45,7 +44,10 @@ def find_module(self, fullname, path=None):
- return None
-
- def load_module(self, fullname):
-- mod = sys.modules.setdefault(fullname, imp.new_module(fullname))
-+ fake_module = object()
-+ fake_module.__qualname__ = fullname
-+ fake_module.__name__ = fullname.rsplit('.', 1)[-1]
-+ mod = sys.modules.setdefault(fullname, fake_module)
- mod.__file__, mod.__loader__, mod.__path__ = "<dummy>", self, []
- mod.__dict__.update(self.mocks[fullname])
- return mod
-
-From c6b7e621e4696c02bf8f6ea423ffbbf2109748ab Mon Sep 17 00:00:00 2001
-From: Stefan Behnel <stefan...@behnel.de>
-Date: Thu, 11 May 2023 10:30:15 +0200
-Subject: [PATCH] Avoid using the deprecated "imp" module.
-
-Closes https://bugs.launchpad.net/lxml/+bug/2018137
---- a/src/lxml/html/tests/test_html5parser.py
-+++ b/src/lxml/html/tests/test_html5parser.py
-@@ -44,7 +44,8 @@ def find_module(self, fullname, path=None):
- return None
-
- def load_module(self, fullname):
-- fake_module = object()
-+ class Cls: pass
-+ fake_module = Cls()
- fake_module.__qualname__ = fullname
- fake_module.__name__ = fullname.rsplit('.', 1)[-1]
- mod = sys.modules.setdefault(fullname, fake_module)
-
diff --git a/dev-python/lxml/lxml-4.9.2-r1.ebuild
b/dev-python/lxml/lxml-4.9.2-r1.ebuild
deleted file mode 100644
index e11d639a40b6..000000000000
--- a/dev-python/lxml/lxml-4.9.2-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 optfeature toolchain-funcs
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="
- https://lxml.de/
- https://pypi.org/project/lxml/
- https://github.com/lxml/lxml/
-"
-SRC_URI="
- https://github.com/lxml/lxml/archive/${P}.tar.gz
- -> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/lxml-${P}
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x64-solaris"
-IUSE="doc examples +threads test"
-RESTRICT="!test? ( test )"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-DEPEND="
- >=dev-libs/libxml2-2.9.12-r2
- >=dev-libs/libxslt-1.1.28
-"
-RDEPEND="
- ${DEPEND}
-"
-BDEPEND="
- virtual/pkgconfig
- <dev-python/cython-3[${PYTHON_USEDEP}]
- >=dev-python/cython-0.29.29[${PYTHON_USEDEP}]
- doc? (
- $(python_gen_any_dep '
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
- ')
- )
- test? (
- dev-python/cssselect[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.6.0-tests-pypy.patch
- "${FILESDIR}"/${P}-py3.12-drop-deprecated-imp.patch
- "${FILESDIR}"/${P}-py3.12-backport-unicode-fix.patch
-)
-
-python_check_deps() {
- use doc || return 0
- python_has_version -b "dev-python/docutils[${PYTHON_USEDEP}]" &&
- python_has_version -b "dev-python/pygments[${PYTHON_USEDEP}]" &&
- python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" &&
- python_has_version -b "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]"
-}
-
-python_prepare_all() {
- # avoid replacing PYTHONPATH in tests.
- sed -i -e '/sys\.path/d' test.py || die
-
- # don't use some random SDK on Darwin
- sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
- setupinfo.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile() {
- tc-export PKG_CONFIG
- distutils-r1_python_compile
-}
-
-python_compile_all() {
- use doc && emake html
-}
-
-python_test() {
- local dir=${BUILD_DIR}/test$(python_get_sitedir)/lxml
- local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
- cp -al "${BUILD_DIR}"/{install,test} || die
- cp -al src/lxml/tests "${dir}/" || die
- cp -al src/lxml/html/tests "${dir}/html/" || die
- ln -rs "${S}"/doc "${dir}"/../../ || die
-
- "${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails
with ${EPYTHON}"
-}
-
-python_install_all() {
- if use doc; then
- local DOCS=( README.rst *.txt doc/*.txt )
- local HTML_DOCS=( doc/html/. )
- fi
- if use examples; then
- dodoc -r samples
- fi
-
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- optfeature "Support for BeautifulSoup as a parser backend"
dev-python/beautifulsoup4
- optfeature "Translates CSS selectors to XPath 1.0 expressions"
dev-python/cssselect
-}
diff --git a/dev-python/lxml/lxml-4.9.2.ebuild
b/dev-python/lxml/lxml-4.9.2.ebuild
deleted file mode 100644
index 113c02e07ba9..000000000000
--- a/dev-python/lxml/lxml-4.9.2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 optfeature toolchain-funcs
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="
- https://lxml.de/
- https://pypi.org/project/lxml/
- https://github.com/lxml/lxml/
-"
-SRC_URI="
- https://github.com/lxml/lxml/archive/${P}.tar.gz
- -> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/lxml-${P}
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x64-solaris"
-IUSE="doc examples +threads test"
-RESTRICT="!test? ( test )"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-DEPEND="
- >=dev-libs/libxml2-2.9.12-r2
- >=dev-libs/libxslt-1.1.28
-"
-RDEPEND="
- ${DEPEND}
-"
-BDEPEND="
- virtual/pkgconfig
- <dev-python/cython-3[${PYTHON_USEDEP}]
- >=dev-python/cython-0.29.29[${PYTHON_USEDEP}]
- doc? (
- $(python_gen_any_dep '
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
- ')
- )
- test? (
- dev-python/cssselect[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.6.0-tests-pypy.patch
- "${FILESDIR}"/${P}-py3.12-drop-deprecated-imp.patch
-)
-
-python_check_deps() {
- use doc || return 0
- python_has_version -b "dev-python/docutils[${PYTHON_USEDEP}]" &&
- python_has_version -b "dev-python/pygments[${PYTHON_USEDEP}]" &&
- python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" &&
- python_has_version -b "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]"
-}
-
-python_prepare_all() {
- # avoid replacing PYTHONPATH in tests.
- sed -i -e '/sys\.path/d' test.py || die
-
- # don't use some random SDK on Darwin
- sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
- setupinfo.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile() {
- tc-export PKG_CONFIG
- distutils-r1_python_compile
-}
-
-python_compile_all() {
- use doc && emake html
-}
-
-python_test() {
- local dir=${BUILD_DIR}/test$(python_get_sitedir)/lxml
- local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
- cp -al "${BUILD_DIR}"/{install,test} || die
- cp -al src/lxml/tests "${dir}/" || die
- cp -al src/lxml/html/tests "${dir}/html/" || die
- ln -rs "${S}"/doc "${dir}"/../../ || die
-
- "${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails
with ${EPYTHON}"
-}
-
-python_install_all() {
- if use doc; then
- local DOCS=( README.rst *.txt doc/*.txt )
- local HTML_DOCS=( doc/html/. )
- fi
- if use examples; then
- dodoc -r samples
- fi
-
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- optfeature "Support for BeautifulSoup as a parser backend"
dev-python/beautifulsoup4
- optfeature "Translates CSS selectors to XPath 1.0 expressions"
dev-python/cssselect
-}
diff --git a/dev-python/lxml/lxml-4.9.3.ebuild
b/dev-python/lxml/lxml-4.9.3.ebuild
deleted file mode 100644
index 0d937323afb9..000000000000
--- a/dev-python/lxml/lxml-4.9.3.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 optfeature toolchain-funcs
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="
- https://lxml.de/
- https://pypi.org/project/lxml/
- https://github.com/lxml/lxml/
-"
-SRC_URI="
- https://github.com/lxml/lxml/archive/${P}.tar.gz
- -> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/lxml-${P}
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
-IUSE="doc examples +threads test"
-RESTRICT="!test? ( test )"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-DEPEND="
- >=dev-libs/libxml2-2.10.3
- >=dev-libs/libxslt-1.1.38
-"
-RDEPEND="
- ${DEPEND}
-"
-BDEPEND="
- virtual/pkgconfig
- <dev-python/cython-3[${PYTHON_USEDEP}]
- >=dev-python/cython-0.29.29[${PYTHON_USEDEP}]
- doc? (
- $(python_gen_any_dep '
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
- ')
- )
- test? (
- dev-python/cssselect[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.9.3-tests-pypy.patch
-)
-
-python_check_deps() {
- use doc || return 0
- python_has_version -b "dev-python/docutils[${PYTHON_USEDEP}]" &&
- python_has_version -b "dev-python/pygments[${PYTHON_USEDEP}]" &&
- python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" &&
- python_has_version -b "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]"
-}
-
-python_prepare_all() {
- # avoid replacing PYTHONPATH in tests.
- sed -i -e '/sys\.path/d' test.py || die
-
- # don't use some random SDK on Darwin
- sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
- setupinfo.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile() {
- tc-export PKG_CONFIG
- distutils-r1_python_compile
-}
-
-python_compile_all() {
- use doc && emake html
-}
-
-python_test() {
- local dir=${BUILD_DIR}/test$(python_get_sitedir)/lxml
- local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
- cp -al "${BUILD_DIR}"/{install,test} || die
- cp -al src/lxml/tests "${dir}/" || die
- cp -al src/lxml/html/tests "${dir}/html/" || die
- ln -rs "${S}"/doc "${dir}"/../../ || die
-
- "${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails
with ${EPYTHON}"
-}
-
-python_install_all() {
- if use doc; then
- local DOCS=( README.rst *.txt doc/*.txt )
- local HTML_DOCS=( doc/html/. )
- fi
- if use examples; then
- dodoc -r samples
- fi
-
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- optfeature "Support for BeautifulSoup as a parser backend"
dev-python/beautifulsoup4
- optfeature "Translates CSS selectors to XPath 1.0 expressions"
dev-python/cssselect
-}
