diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 29810c4df1cc5b..88aa37d4318285 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -95,7 +95,7 @@ jobs:
build_win32:
name: 'Windows (x86)'
- runs-on: windows-latest
+ runs-on: windows-2019
needs: check_source
if: needs.check_source.outputs.run_tests == 'true'
steps:
@@ -109,7 +109,7 @@ jobs:
build_win_amd64:
name: 'Windows (x64)'
- runs-on: windows-latest
+ runs-on: windows-2019
needs: check_source
if: needs.check_source.outputs.run_tests == 'true'
steps:
@@ -184,7 +184,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- openssl_ver: [1.0.2u, 1.1.0l, 1.1.1l, 3.0.0-beta1]
+ openssl_ver: [1.0.2u, 1.1.0l, 1.1.1l]
env:
OPENSSL_VER: ${{ matrix.openssl_ver }}
MULTISSL_DIR: ${{ github.workspace }}/multissl
diff --git a/Lib/test/test_minidom.py b/Lib/test/test_minidom.py
index 70965854ed1b1c..06c91079abdd99 100644
--- a/Lib/test/test_minidom.py
+++ b/Lib/test/test_minidom.py
@@ -6,10 +6,12 @@
from test import support
import unittest
+import pyexpat
import xml.dom.minidom
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")
@@ -1147,7 +1149,13 @@ def testEncodings(self):
# 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,
b'Comment \xe7a va ? Tr\xe8s bien ?')
doc.unlink()
@@ -1593,7 +1601,12 @@ def testEmptyXMLNSValue(self):
self.confirm(doc2.namespaceURI == xml.dom.EMPTY_NAMESPACE)
def testExceptionOnSpacesInXMLNSValue(self):
- with self.assertRaisesRegex(ValueError, 'Unsupported syntax'):
+ if pyexpat.version_info >= (2, 4, 5):
+ context = self.assertRaisesRegex(ExpatError, 'syntax error')
+ else:
+ context = self.assertRaisesRegex(ValueError, 'Unsupported syntax')
+
+ with context:
parseString('')
def testDocRemoveChild(self):
diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
index d41ff4fd077e65..0a788477fc1559 100644
--- a/Lib/test/test_xml_etree.py
+++ b/Lib/test/test_xml_etree.py
@@ -1968,12 +1968,6 @@ def test_issue6233(self):
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'])
diff --git a/Misc/NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst b/Misc/NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst
new file mode 100644
index 00000000000000..6969bd1898f658
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst
@@ -0,0 +1 @@
+Make test suite support Expat >=2.4.5