From: Martin v. Löwis <martin@v.loewis.de>
Date: Sun, 2 May 2004 20:37:47 +0000 (+0000)
Subject: Do not use the default namespace for attributes.
X-Git-Tag: v2.3.4c1~49
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2dbc9cd927e42c22e6bc315609384781376183d9;p=thirdparty%2FPython%2Fcpython.git

Do not use the default namespace for attributes.
Fixes http://bugs.debian.org/229885
---

diff --git a/Lib/xmllib.py b/Lib/xmllib.py
index cdc861eb6894..7eccd966e03b 100644
--- a/Lib/xmllib.py
+++ b/Lib/xmllib.py
@@ -6,8 +6,7 @@ import re
 import string
 
 import warnings
-warnings.warn("The xmllib module is obsolete.  Use xml.sax instead.",
-              DeprecationWarning)
+warnings.warn("The xmllib module is obsolete.  Use xml.sax instead.", DeprecationWarning)
 del warnings
 
 version = '0.3'
@@ -641,20 +640,17 @@ class XMLParser:
                     aprefix, key = res.group('prefix', 'local')
                     if self.__map_case:
                         key = key.lower()
-                    if aprefix is None:
-                        aprefix = ''
-                    ans = None
-                    for t, d, nst in self.stack:
-                        if aprefix in d:
-                            ans = d[aprefix]
-                    if ans is None and aprefix != '':
-                        ans = self.__namespaces.get(aprefix)
-                    if ans is not None:
-                        key = ans + ' ' + key
-                    elif aprefix != '':
-                        key = aprefix + ':' + key
-                    elif ns is not None:
-                        key = ns + ' ' + key
+                    if aprefix is not None:
+                        ans = None
+                        for t, d, nst in self.stack:
+                            if aprefix in d:
+                                ans = d[aprefix]
+                        if ans is None:
+                            ans = self.__namespaces.get(aprefix)
+                        if ans is not None:
+                            key = ans + ' ' + key
+                        else:
+                            key = aprefix + ':' + key
                 nattrdict[key] = val
                 attrnamemap[key] = okey
             attrdict = nattrdict