From 7760f38ab4684a73640edad3be25113f74944926958dd67835c79fd06b472e7d Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Wed, 15 Jun 2022 04:51:16 +0000
Subject: [PATCH] Adjust support-expat-CVE-2022-25236-patched.patch

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python310?expand=0&rev=43
---
 support-expat-CVE-2022-25236-patched.patch | 50 ++++++++++++++++------
 1 file changed, 38 insertions(+), 12 deletions(-)

diff --git a/support-expat-CVE-2022-25236-patched.patch b/support-expat-CVE-2022-25236-patched.patch
index 34cc199..e7b3acb 100644
--- a/support-expat-CVE-2022-25236-patched.patch
+++ b/support-expat-CVE-2022-25236-patched.patch
@@ -23,27 +23,53 @@ Also, test_minidom.py: Support Expat >=2.4.5
 
 Co-authored-by: Sebastian Pipping <sebastian@pipping.org>
 ---
- Lib/test/test_minidom.py |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ Lib/test/test_minidom.py |   25 ++++++++++---------------
+ 1 file changed, 10 insertions(+), 15 deletions(-)
  create mode 100644 Misc/NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst
 
 --- a/Lib/test/test_minidom.py
 +++ b/Lib/test/test_minidom.py
-@@ -1149,7 +1149,7 @@ class MinidomTest(unittest.TestCase):
+@@ -6,7 +6,6 @@ import io
+ from test import support
+ import unittest
+ 
+-import pyexpat
+ import xml.dom.minidom
+ 
+ from xml.dom.minidom import parse, Node, Document, parseString
+@@ -1149,13 +1148,11 @@ class MinidomTest(unittest.TestCase):
  
          # Verify that character decoding errors raise exceptions instead
          # of crashing
 -        if pyexpat.version_info >= (2, 4, 5):
-+        if pyexpat.version_info >= (2, 4, 4):
-             self.assertRaises(ExpatError, parseString,
-                     b'<fran\xe7ais></fran\xe7ais>')
-             self.assertRaises(ExpatError, parseString,
-@@ -1617,7 +1617,7 @@ class MinidomTest(unittest.TestCase):
+-            self.assertRaises(ExpatError, parseString,
+-                    b'<fran\xe7ais></fran\xe7ais>')
+-            self.assertRaises(ExpatError, parseString,
+-                    b'<franais>Comment \xe7a va ? Tr\xe8s bien ?</franais>')
+-        else:
+-            self.assertRaises(UnicodeDecodeError, parseString,
++        # It doesn’t make any sense to insist on the exact text of the
++        # error message, or even the exact Exception … it is enough that
++        # the error has been discovered.
++        with self.assertRaises((UnicodeDecodeError, ExpatError)):
++            parseString(
+                 b'<fran\xe7ais>Comment \xe7a va ? Tr\xe8s bien ?</fran\xe7ais>')
+ 
+         doc.unlink()
+@@ -1617,12 +1614,10 @@ class MinidomTest(unittest.TestCase):
          self.confirm(doc2.namespaceURI == xml.dom.EMPTY_NAMESPACE)
  
      def testExceptionOnSpacesInXMLNSValue(self):
 -        if pyexpat.version_info >= (2, 4, 5):
-+        if pyexpat.version_info >= (2, 4, 4):
-             context = self.assertRaisesRegex(ExpatError, 'syntax error')
-         else:
-             context = self.assertRaisesRegex(ValueError, 'Unsupported syntax')
+-            context = self.assertRaisesRegex(ExpatError, 'syntax error')
+-        else:
+-            context = self.assertRaisesRegex(ValueError, 'Unsupported syntax')
+-
+-        with context:
++        # It doesn’t make any sense to insist on the exact text of the
++        # error message, or even the exact Exception … it is enough that
++        # the error has been discovered.
++        with self.assertRaises((ExpatError, ValueError)):
+             parseString('<element xmlns:abc="http:abc.com/de f g/hi/j k"><abc:foo /></element>')
+ 
+     def testDocRemoveChild(self):