From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Wed, 14 Mar 2012 20:44:02 +0000 (-0700)
Subject: Merge from tip
X-Git-Tag: v3.3.0a2~193^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b53da6e374619428e74ae23d5a6e1f22a0de1401;p=python

Merge from tip
---

b53da6e374619428e74ae23d5a6e1f22a0de1401
diff --cc Misc/NEWS
index 2e4f15d47a,96ce07c3af..8dace0c759
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -24,8 -24,16 +24,18 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #14200: Idle shell crash on printing non-BMP unicode character.
 +
+ - Issue #12818: format address no longer needlessly \ escapes ()s in names when
+   the name ends up being quoted.
+ 
+ - Issue #14062: BytesGenerator now correctly folds Header objects,
+   including using linesep when folding.
+ 
+ - Issue #13839: When invoked on the command-line, the pstats module now
+   accepts several filenames of profile stat files and merges them all.
+   Patch by Matt Joiner.
+ 
  - Issue #14291: Email now defaults to utf-8 for non-ASCII unicode headers
    instead of raising an error.  This fixes a regression relative to 2.7.