From: Serhiy Storchaka <storchaka@gmail.com>
Date: Wed, 22 May 2013 14:21:06 +0000 (+0300)
Subject: Issue #16986: ElementTree now correctly parses a string input not only when
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=447b6e3c6ece7db5eb056311b473285366f6cadb;p=python

Issue #16986: ElementTree now correctly parses a string input not only when
an internal XML encoding is UTF-8 or US-ASCII.
---

447b6e3c6ece7db5eb056311b473285366f6cadb
diff --cc Misc/NEWS
index 8bd5e0b50f,15c6c9eca5..d56987dfe2
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -96,35 -106,6 +96,38 @@@ Core and Builtin
  Library
  -------
  
++- Issue #16986: ElementTree now correctly parses a string input not only when
++  an internal XML encoding is UTF-8 or US-ASCII.
++
 +- Issue #17996: socket module now exposes AF_LINK constant on BSD and OSX.
 +
 +- Issue #17900: Allowed pickling of recursive OrderedDicts.  Decreased pickled
 +  size and pickling time.
 +
 +- Issue #17914: Add os.cpu_count(). Patch by Yogesh Chaudhari, based on an
 +  initial patch by Trent Nelson.
 +
 +- Issue #17812: Fixed quadratic complexity of base64.b32encode().
 +  Optimize base64.b32encode() and base64.b32decode() (speed up to 3x).
 +
 +- Issue #17980: Fix possible abuse of ssl.match_hostname() for denial of
 +  service using certificates with many wildcards (CVE-2013-2099).
 +
 +- Issue #15758: Fix FileIO.readall() so it no longer has O(n**2) complexity.
 +
 +- Issue #14596: The struct.Struct() objects now use more compact implementation.
 +
 +- Issue #17981: Closed socket on error in SysLogHandler.
 +
 +- Issue #17964: Fix os.sysconf(): the return type of the C sysconf() function
 +  is long, not int.
 +
 +- Fix typos in the multiprocessing module.
 +
 +- Issue #17754: Make ctypes.util.find_library() independent of the locale.
 +
 +- Issue #17968: Fix memory leak in os.listxattr().
 +
  - Issue #17606: Fixed support of encoded byte strings in the XMLGenerator
    characters() and ignorableWhitespace() methods.  Original patch by Sebastian
    Ortiz Vasquez.
diff --cc Modules/_elementtree.c
index c53f5ee219,5078b8372f..0d86886579
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@@ -3523,9 -3584,16 +3544,9 @@@ xmlparser_setevents(XMLParserObject *se
  }
  
  static PyMethodDef xmlparser_methods[] = {
-     {"feed", (PyCFunction) xmlparser_feed, METH_VARARGS},
+     {"feed", (PyCFunction) xmlparser_feed, METH_O},
      {"close", (PyCFunction) xmlparser_close, METH_VARARGS},
 -    {"_parse", (PyCFunction) xmlparser_parse, METH_VARARGS},
 +    {"_parse_whole", (PyCFunction) xmlparser_parse_whole, METH_VARARGS},
      {"_setevents", (PyCFunction) xmlparser_setevents, METH_VARARGS},
      {"doctype", (PyCFunction) xmlparser_doctype, METH_VARARGS},
      {NULL, NULL}