[Python-checkins] python/dist/src/Lib/xml/sax saxutils.py,1.18,1.19

[fdrake@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib/xml/sax
In directory usw-pr-cvs1:/tmp/cvs-serv29586/xml/sax

Modified Files:
	saxutils.py 
Log Message:
Really do replacement of & last to avoid bad interactions between &
replacement and replacements based on the entities parameter.


Index: saxutils.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/xml/sax/saxutils.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** saxutils.py	28 Oct 2002 17:29:01 -0000	1.18
--- saxutils.py	28 Oct 2002 17:46:59 -0000	1.19
***************
*** 44,51 ****
      data = data.replace("&lt;", "<")
      data = data.replace("&gt;", ">")
-     # must do ampersand last
-     data = data.replace("&amp;", "&")
      if entities:
          data = __dict_replace(data, entities)
      return data
  
--- 44,51 ----
      data = data.replace("&lt;", "<")
      data = data.replace("&gt;", ">")
      if entities:
          data = __dict_replace(data, entities)
+     # must do ampersand last
+     data = data.replace("&amp;", "&")
      return data