From: Fred Drake <fdrake@acm.org>
Date: Mon, 28 Oct 2002 17:46:59 +0000 (+0000)
Subject: Really do replacement of &amp; last to avoid bad interactions between &amp;
X-Git-Tag: v2.3c1~3663
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=407fea5197cc684a4941d3b47b018c1a80314223;p=thirdparty%2FPython%2Fcpython.git

Really do replacement of &amp; last to avoid bad interactions between &amp;
replacement and replacements based on the entities parameter.
---

diff --git a/Lib/xml/sax/saxutils.py b/Lib/xml/sax/saxutils.py
index 049e09cd35d7..035715c28914 100644
--- 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={}):