Fix test failure with newer Expat:
https://bugs.python.org/issue46811
This is a backport of this upstream commit:
https://github.com/python/cpython/commit/2cae93832f46b245847bdc252456ddf7742ef45e
diff --git a/Lib/test/test_minidom.py b/Lib/test/test_minidom.py
index 2eb642395b..1793f9365d 100644
--- a/Lib/test/test_minidom.py
+++ b/Lib/test/test_minidom.py
@@ -6,12 +6,14 @@ from StringIO import StringIO
from test import support
import unittest
+import pyexpat
import xml.dom
import xml.dom.minidom
import xml.parsers.expat
from xml.dom.minidom import parse, Node, Document, parseString
from xml.dom.minidom import getDOMImplementation
+from xml.parsers.expat import ExpatError
tstfile = support.findfile("test.xml", subdir="xmltestdata")
@@ -1051,7 +1053,13 @@ class MinidomTest(unittest.TestCase):
# Verify that character decoding errors raise exceptions instead
# of crashing
- self.assertRaises(UnicodeDecodeError, parseString,
+ if pyexpat.version_info >= (2, 4, 5):
+ self.assertRaises(ExpatError, parseString,
+ b'')
+ self.assertRaises(ExpatError, parseString,
+ b'Comment \xe7a va ? Tr\xe8s bien ?')
+ else:
+ self.assertRaises(UnicodeDecodeError, parseString,
'Comment \xe7a va ? Tr\xe8s bien ?')
doc.unlink()
diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
index c75d55f05c..0855bc07ca 100644
--- a/Lib/test/test_xml_etree.py
+++ b/Lib/test/test_xml_etree.py
@@ -1482,12 +1482,6 @@ class BugsTest(unittest.TestCase):
b"\n"
b'
tãg')
- def test_issue3151(self):
- e = ET.XML('')
- self.assertEqual(e.tag, '{${stuff}}localname')
- t = ET.ElementTree(e)
- self.assertEqual(ET.tostring(e), b'')
-
def test_issue6565(self):
elem = ET.XML("")
self.assertEqual(summarize_list(elem), ['tag'])
9087511aa083f768cf32ec9ecd3fc0&showmsg=1'>root/gnu/packages/rdesktop.scmAge | Commit message (Collapse) | Author |
|
Fixes CVE-2018-{8791,8792,8793,8794,8795,8796,8797,8798,8799,8800,20174,20175,
20176,20177,20178,20179,20180,20181,20182}.
* gnu/packages/rdesktop.scm (rdesktop): Update to 1.8.4.
[source]: Update URL.
[home-page]: Use HTTPS URL.
[arguments]: Add phase 'delete-extraneous-files'.
|
|
* gnu/packages/rdesktop.scm (rdesktop)[source]: Hard-code name.
|
|
* gnu/packages/rdesktop.scm (freerdp)[arguments]: Enable tests. Add
configure-flag to build tests.
|
|
* gnu/packages/rdesktop.scm (freerdp): Update to 2.0.0-rc4.
[native-inputs]: Add docbook-xml, glib. Sort alphabetically.
[inputs]: Add libxkbcommon, wayland. Sort alphabetically.
[arguments]: Explicitly disable libsystemd.
|