[Python-checkins] python/dist/src/Lib xmllib.py,1.31,1.31.10.1

[loewis at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1968/Lib

Modified Files:
      Tag: release23-maint
	xmllib.py 
Log Message:
Do not use the default namespace for attributes.
Fixes http://bugs.debian.org/229885


Index: xmllib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/xmllib.py,v
retrieving revision 1.31
retrieving revision 1.31.10.1
diff -C2 -d -r1.31 -r1.31.10.1
*** xmllib.py	27 Feb 2003 20:14:45 -0000	1.31
--- xmllib.py	2 May 2004 20:37:47 -0000	1.31.10.1
***************
*** 7,12 ****
  
  import warnings
! warnings.warn("The xmllib module is obsolete.  Use xml.sax instead.",
!               DeprecationWarning)
  del warnings
  
--- 7,11 ----
  
  import warnings
! warnings.warn("The xmllib module is obsolete.  Use xml.sax instead.", DeprecationWarning)
  del warnings
  
***************
*** 642,659 ****
                      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
                  nattrdict[key] = val
                  attrnamemap[key] = okey
--- 641,655 ----
                      if self.__map_case:
                          key = key.lower()
!                     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