Swap public and system ID in start_doctype_decl. Fixes #780300.

diff --git a/Doc/whatsnew/whatsnew24.tex b/Doc/whatsnew/whatsnew24.tex
index 8e2b11ec319029909affc5d33b7baf0d3dc0d7e2..ff8a3fa1cea2104519100c5e0f0c5d3e3c8e99ac 100644 (file)
--- a/Doc/whatsnew/whatsnew24.tex
+++ b/Doc/whatsnew/whatsnew24.tex
@@ -561,6 +561,10 @@ changes to your code:
 \item \function{dircache.listdir()} now passes exceptions to the caller
       instead of returning empty lists.
 
+\item \function{LexicalHandler.startDTD} used to receive public and system ID
+  in the wrong order. This has been corrected; applications relying on the
+  wrong order need to be fixed.
+
 \end{itemize}
 
 

diff --git a/Lib/xml/sax/expatreader.py b/Lib/xml/sax/expatreader.py
index 58ad77358110aece769b871f5ea36885768d2bec..ab8cbc1244bb48dff0ef3b0b2d95484eae759805 100644 (file)
--- a/Lib/xml/sax/expatreader.py
+++ b/Lib/xml/sax/expatreader.py
@@ -361,7 +361,7 @@ class ExpatParser(xmlreader.IncrementalParser, xmlreader.Locator):
     def end_namespace_decl(self, prefix):
         self._cont_handler.endPrefixMapping(prefix)
 
-    def start_doctype_decl(self, name, pubid, sysid, has_internal_subset):
+    def start_doctype_decl(self, name, sysid, pubid, has_internal_subset):
         self._lex_handler_prop.startDTD(name, pubid, sysid)
 
     def unparsed_entity_decl(self, name, base, sysid, pubid, notation_name):

diff --git a/Misc/NEWS b/Misc/NEWS
index 983c54888297e00c484e0b595b3c694fd19b907f..809d2d972cb44d6f78a98b187bbccacb359234bd 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -306,6 +306,9 @@ Extension modules
 Library
 -------
 
+- Bug #780300: Swap public and system ID in LexicalHandler.startDTD.
+  Applications relying on the wrong order need to be corrected.
+
 - Bug #926075: Fixed a bug that returns a wrong pattern object
   for a string or unicode object in sre.compile() when a different
   type pattern with the same value exists.