From: R David Murray <rdmurray@bitdance.com>
Date: Sun, 20 Apr 2014 04:46:05 +0000 (-0400)
Subject: #12220: improve minidom error when URI contains spaces.
X-Git-Tag: v3.4.1rc1~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9077d24d7f85e09e53def11b2beeaf40749e2464;p=python

#12220: improve minidom error when URI contains spaces.

Fix by 'amathew', test by Marek Stepniowski.
---

diff --git a/Lib/test/test_minidom.py b/Lib/test/test_minidom.py
index a1516c242d..5ab4bfe1a4 100644
--- a/Lib/test/test_minidom.py
+++ b/Lib/test/test_minidom.py
@@ -1518,6 +1518,10 @@ class MinidomTest(unittest.TestCase):
         doc2 = parseString(doc.toxml())
         self.confirm(doc2.namespaceURI == xml.dom.EMPTY_NAMESPACE)
 
+    def testExceptionOnSpacesInXMLNSValue(self):
+        with self.assertRaisesRegex(ValueError, 'Unsupported syntax'):
+            parseString('<element xmlns:abc="http:abc.com/de f g/hi/j k"><abc:foo /></element>')
+
     def testDocRemoveChild(self):
         doc = parse(tstfile)
         title_tag = doc.documentElement.getElementsByTagName("TITLE")[0]
diff --git a/Lib/xml/dom/expatbuilder.py b/Lib/xml/dom/expatbuilder.py
index 81e2df70d7..8976144340 100644
--- a/Lib/xml/dom/expatbuilder.py
+++ b/Lib/xml/dom/expatbuilder.py
@@ -121,10 +121,12 @@ def _parse_ns_name(builder, name):
         qname = "%s:%s" % (prefix, localname)
         qname = intern(qname, qname)
         localname = intern(localname, localname)
-    else:
+    elif len(parts) == 2:
         uri, localname = parts
         prefix = EMPTY_PREFIX
         qname = localname = intern(localname, localname)
+    else:
+        raise ValueError("Unsupported syntax: spaces in URIs not supported: %r" % name)
     return intern(uri, uri), localname, prefix, qname
 
 
diff --git a/Misc/ACKS b/Misc/ACKS
index 65d1adbe05..4173917e73 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1255,6 +1255,7 @@ Joel Stanley
 Anthony Starks
 Oliver Steele
 Greg Stein
+Marek Stepniowski
 Baruch Sterin
 Chris Stern
 Alex Stewart
diff --git a/Misc/NEWS b/Misc/NEWS
index 5edfb042a8..804f1ae41e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -39,6 +39,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #12220: mindom now raises a custom ValueError indicating it doesn't
+  support spaces in URIs instead of letting a 'split' ValueError bubble up.
+
 - Issue #21239: patch.stopall() didn't work deterministically when the same
   name was patched more than once.