From: Georg Brandl <georg@python.org>
Date: Sun, 12 May 2013 09:52:22 +0000 (+0200)
Subject: merge with 3.2
X-Git-Tag: v3.3.2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=64949fa20e4845e92a1d42f581a47b559a9acd25;p=thirdparty%2FPython%2Fcpython.git

merge with 3.2
---

64949fa20e4845e92a1d42f581a47b559a9acd25
diff --cc Misc/NEWS
index 251651c222d6,7308e72a8351..22f0abb23da3
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -226,22 -35,8 +226,25 @@@ Test
  - Issue #17843: Removed bz2 test data file that was triggering false-positive
    virus warnings with certain antivirus software.
  
 +Documentation
 +-------------
 +
 +- Issue #15940: Specify effect of locale on time functions.
 +
 +- Issue #6696: add documentation for the Profile objects, and improve
 +  profile/cProfile docs.  Patch by Tom Pinckney.
 +
++- Issue #17915: Fix interoperability of xml.sax with file objects returned by
++  codecs.open().
++
 +Build
 +-----
 +
 +- Issue #17547: In configure, explicitly pass -Wformat for the benefit for GCC
 +  4.8.
 +
  
 -What's New in Python 3.2.4?
 +What's New in Python 3.3.1?
  ===========================
  
  *Release date: 07-Apr-2013*