From: Gregory P. Smith <greg@krypto.org>
Date: Tue, 19 Mar 2013 22:30:41 +0000 (-0700)
Subject: merge from 3.2
X-Git-Tag: v3.3.1rc1~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3cc791c5a19ccf6d3f2a8465d935e160b0aeb8d0;p=thirdparty%2FPython%2Fcpython.git

merge from 3.2
---

3cc791c5a19ccf6d3f2a8465d935e160b0aeb8d0
diff --cc Misc/NEWS
index 742c86bae919,856eae4cf4aa..1377e5964daf
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -2,25 -2,17 +2,28 @@@
  Python News
  +++++++++++
  
 -What's New in Python 3.2.4
 -==========================
 +What's New in Python 3.3.1?
 +===========================
 +
 +*Not yet released, see sections below for changes released in 3.3.0*
  
- .. *Release date: XX-XXX-2012*
 -*Release date: XX-XX-XXXX*
++.. *Release date: 2013-XX-XX*
  
  Core and Builtins
  -----------------
  
 +- Issue #17328: Fix possible refleak in dict.setdefault.
 +
 +- Issue #17223: array module: Fix a crasher when converting an array containing
 +  invalid characters (outside range [U+0000; U+10ffff]) to Unicode:
 +  repr(array), str(array) and array.tounicode(). Patch written by Manuel Jacob.
 +
 +- Issue #17223: Fix PyUnicode_FromUnicode() for string of 1 character outside
 +  the range U+0000-U+10ffff.
 +
+ - Issue #1692335: Move initial args assignment to
+   BaseException.__new__ to help pickling of naive subclasses.
+ 
  - Issue #17275: Corrected class name in init error messages of the C version of
    BufferedWriter and BufferedRandom.