Really do replacement of & last to avoid bad interactions between &

replacement and replacements based on the entities parameter.

diff --git a/Lib/xml/sax/saxutils.py b/Lib/xml/sax/saxutils.py
index 049e09cd35d778fe64052475670903863733fe7f..035715c289141d10afc4439d905fd21d2a9f3207 100644 (file)
--- a/Lib/xml/sax/saxutils.py
+++ b/Lib/xml/sax/saxutils.py
@@ -43,10 +43,10 @@ def unescape(data, entities={}):
     """
     data = data.replace("&lt;", "<")
     data = data.replace("&gt;", ">")
-    # must do ampersand last
-    data = data.replace("&amp;", "&")
     if entities:
         data = __dict_replace(data, entities)
+    # must do ampersand last
+    data = data.replace("&amp;", "&")
     return data
 
 def quoteattr(data, entities={}):