[gentoo-commits] repo/gentoo:master commit in: dev-python/lxml/files/

[Aaron Bauman]

commit:     33dcd1e862f8c08509ac7d63cd90411159448053
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue May 19 19:21:40 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue Jun  2 04:28:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33dcd1e8

dev-python/lxml: remove unused patch

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 dev-python/lxml/files/lxml-4.4.2-tests-pypy.patch | 415 ----------------------
 1 file changed, 415 deletions(-)

diff --git a/dev-python/lxml/files/lxml-4.4.2-tests-pypy.patch b/dev-python/lxml/files/lxml-4.4.2-tests-pypy.patch
deleted file mode 100644
index 780970897f8..00000000000
--- a/dev-python/lxml/files/lxml-4.4.2-tests-pypy.patch
+++ /dev/null
@@ -1,415 +0,0 @@
-diff --git a/src/lxml/tests/test_elementtree.py b/src/lxml/tests/test_elementtree.py
-index 435807a5..3999de1f 100644
---- a/src/lxml/tests/test_elementtree.py
-+++ b/src/lxml/tests/test_elementtree.py
-@@ -27,7 +27,7 @@ if this_dir not in sys.path:
- from common_imports import BytesIO, etree, HelperTestCase
- from common_imports import ElementTree, cElementTree, ET_VERSION, CET_VERSION
- from common_imports import filter_by_version, fileInTestDir, canonicalize, tmpfile
--from common_imports import _str, _bytes, unicode, next, IS_PYTHON2
-+from common_imports import _str, _bytes, unicode, next, IS_PYTHON2, IS_PYPY
- 
- if cElementTree is not None and (CET_VERSION <= (1,0,7) or sys.version_info[0] >= 3):
-     cElementTree = None
-@@ -2928,6 +2928,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 9dc648eb..1853e546 100644
---- a/src/lxml/tests/test_errors.py
-+++ b/src/lxml/tests/test_errors.py
-@@ -13,7 +13,7 @@ this_dir = os.path.dirname(__file__)
- if this_dir not in sys.path:
-     sys.path.insert(0, this_dir) # needed for Py3
- 
--from common_imports import HelperTestCase
-+from common_imports import HelperTestCase, IS_PYPY
- 
- 
- class ErrorTestCase(HelperTestCase):
-@@ -27,6 +27,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 d058fad2..b905fdfb 100644
---- a/src/lxml/tests/test_http_io.py
-+++ b/src/lxml/tests/test_http_io.py
-@@ -17,10 +17,11 @@ if this_dir not in sys.path:
-     sys.path.insert(0, this_dir)  # needed for Py3
- 
- from .common_imports import (
--    etree, HelperTestCase, BytesIO, _bytes)
-+    etree, HelperTestCase, BytesIO, _bytes, IS_PYPY)
- from .dummy_http_server import webserver, HTTPRequestCollector
- 
- 
-+@××××××××.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 b8b41063..e8d275b9 100644
---- a/src/lxml/tests/test_nsclasses.py
-+++ b/src/lxml/tests/test_nsclasses.py
-@@ -12,7 +12,7 @@ if this_dir not in sys.path:
-     sys.path.insert(0, this_dir) # needed for Py3
- 
- from common_imports import etree, HelperTestCase, _bytes
--from common_imports import doctest, make_doctest
-+from common_imports import doctest, make_doctest, IS_PYPY
- 
- class ETreeNamespaceClassesTestCase(HelperTestCase):
-     
-@@ -49,6 +49,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 78035d04..45e73d97 100644
---- a/src/lxml/tests/test_objectify.py
-+++ b/src/lxml/tests/test_objectify.py
-@@ -13,7 +13,7 @@ if this_dir not in sys.path:
- 
- from common_imports import etree, HelperTestCase, fileInTestDir
- from common_imports import SillyFileLike, canonicalize, doctest, make_doctest
--from common_imports import _bytes, _str, StringIO, BytesIO
-+from common_imports import _bytes, _str, StringIO, BytesIO, IS_PYPY
- 
- from lxml import objectify
- 
-@@ -216,11 +216,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')
-@@ -377,6 +379,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", 
-@@ -812,6 +815,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
-@@ -841,6 +845,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
-@@ -874,6 +879,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
-@@ -881,6 +887,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
-@@ -888,6 +895,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
-@@ -895,6 +903,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
-@@ -907,6 +916,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
-@@ -917,6 +927,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)
-@@ -982,6 +993,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
-@@ -989,6 +1001,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
-@@ -996,6 +1009,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
-@@ -1003,6 +1017,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
-@@ -1015,6 +1030,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
-@@ -1040,6 +1056,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")
-@@ -1056,6 +1073,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
-@@ -1072,6 +1090,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'
-@@ -1091,6 +1110,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
-@@ -1172,6 +1192,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
-@@ -1334,6 +1355,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>'))
-@@ -1361,6 +1383,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>'))
-@@ -1383,6 +1406,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>'))
-@@ -2052,6 +2076,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):
-@@ -2522,46 +2547,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
-@@ -2576,6 +2610,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):
-@@ -2677,7 +2712,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 a2df6ddb..0951d5e1 100644
---- a/src/lxml/tests/test_xpathevaluator.py
-+++ b/src/lxml/tests/test_xpathevaluator.py
-@@ -11,7 +11,7 @@ if this_dir not in sys.path:
-     sys.path.insert(0, this_dir) # needed for Py3
- 
- from common_imports import etree, HelperTestCase, _bytes, BytesIO
--from common_imports import doctest, make_doctest
-+from common_imports import doctest, make_doctest, IS_PYPY
- 
- class ETreeXPathTestCase(HelperTestCase):
-     """XPath tests etree"""
-@@ -742,8 +742,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 08d03514..b81716c5 100644
---- a/src/lxml/tests/test_xslt.py
-+++ b/src/lxml/tests/test_xslt.py
-@@ -19,6 +19,8 @@ if this_dir not in sys.path:
-     sys.path.insert(0, this_dir) # needed for Py3
- 
- 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__':