From: Georg Brandl <georg@python.org>
Date: Mon, 24 Sep 2012 11:41:52 +0000 (+0200)
Subject: Port #16012 fix: parameter parsing regression in pyexpat parser UseForeignDTD() method.
X-Git-Tag: v3.3.0~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d37b9d7e1bd08c418a26e7216addf9d5e78419fb;p=thirdparty%2FPython%2Fcpython.git

Port #16012 fix: parameter parsing regression in pyexpat parser UseForeignDTD() method.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index bdab24515519..baa9fcd7a6d0 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,6 +13,12 @@ Core and Builtins
 Library
 -------
 
+Extension Modules
+-----------------
+
+- Issue #16012: Fix a regression in pyexpat. The parser's UseForeignDTD()
+  method doesn't require an argument again.
+
 
 What's New in Python 3.3.0 Release Candidate 3?
 ===============================================
@@ -22,7 +28,7 @@ What's New in Python 3.3.0 Release Candidate 3?
 Core and Builtins
 -----------------
 
-- Issue #15900: Fixed reference leak in PyUnicode_TranslateCharmap().
+- Issue #15900: Fix reference leak in PyUnicode_TranslateCharmap().
 
 - Issue #15926: Fix crash after multiple reinitializations of the interpreter.
 
@@ -59,6 +65,7 @@ Extension Modules
 
 - _decimal module: use only C 89 style comments.
 
+
 What's New in Python 3.3.0 Release Candidate 2?
 ===============================================
 
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
index bd2726877f43..3f59f0fdc15c 100644
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -1035,7 +1035,7 @@ xmlparse_UseForeignDTD(xmlparseobject *self, PyObject *args)
 {
     int flag = 1;
     enum XML_Error rc;
-    if (!PyArg_ParseTuple(args, "p:UseForeignDTD", &flag))
+    if (!PyArg_ParseTuple(args, "|p:UseForeignDTD", &flag))
         return NULL;
     rc = XML_UseForeignDTD(self->itself, flag ? XML_TRUE : XML_FALSE);
     if (rc != XML_ERROR_NONE) {