From: Larry Hastings <larry@hastings.org>
Date: Tue, 22 Oct 2013 17:49:20 +0000 (-0700)
Subject: Merge 3.4.0a4 release head back into trunk.
X-Git-Tag: v3.4.0b1~571
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d0a7e678044dc86860cb362f153a2be5976200d9;p=thirdparty%2FPython%2Fcpython.git

Merge 3.4.0a4 release head back into trunk.
---

d0a7e678044dc86860cb362f153a2be5976200d9
diff --cc Misc/NEWS
index 642acaccc698,fc88fbf71092..0773f9697a3f
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -13,9 -19,21 +19,36 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #16595: Add prlimit() to resource module.
+ 
+ - Issue #19324: Expose Linux-specific constants in resource module.
+ 
+ - Issue #17400: ipaddress should make it easy to identify rfc6598 addresses.
+ 
+ - Load SSL's error strings in hashlib.
+ 
+ - Issue #18527: Upgrade internal copy of zlib to 1.2.8.
+ 
+ - Issue #19274: Add a filterfunc parameter to PyZipFile.writepy.
+ 
++- Issue #8964: fix platform._sys_version to handle IronPython 2.6+.
++  Patch by Martin Matusiak.
++
++- Issue #18958: Improve error message for json.load(s) while passing a string
++  that starts with a UTF-8 BOM.
++
++- Issue #19307: Improve error message for json.load(s) while passing objects
++  of the wrong type.
++
++- Issue #16038: CVE-2013-1752: ftplib: Limit amount of data read by
++  limiting the call to readline().  Original patch by Michał
++  Jastrzębski and Giampaolo Rodola.
++
++- Issue #17087: Improved the repr for regular expression match objects.
++
  
  What's New in Python 3.4.0 Alpha 4?
- ================================
+ ===================================
  
  Release date: 2013-10-20