From: Victor Stinner <victor.stinner@gmail.com>
Date: Tue, 13 May 2014 00:06:33 +0000 (+0200)
Subject: (Merge 3.4) Issue #21398: Fix an unicode error in the pydoc pager when the
X-Git-Tag: v3.5.0a1~1671
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=38d3d22b29abed5a92166b86dddbbc575cf4ae02;p=thirdparty%2FPython%2Fcpython.git

(Merge 3.4) Issue #21398: Fix an unicode error in the pydoc pager when the
documentation contains characters not encodable to the stdout encoding.
---

38d3d22b29abed5a92166b86dddbbc575cf4ae02
diff --cc Misc/NEWS
index 7366cd845316,32004cb864ad..574607456368
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -84,21 -79,6 +84,24 @@@ Core and Builtin
  Library
  -------
  
++- Issue #21398: Fix an unicode error in the pydoc pager when the documentation
++  contains characters not encodable to the stdout encoding.
++
 +- Issue #16531: ipaddress.IPv4Network and ipaddress.IPv6Network now accept
 +  an (address, netmask) tuple argument, so as to easily construct network
 +  objects from existing addresses.
 +
 +- Issue #21156: importlib.abc.InspectLoader.source_to_code() is now a
 +  staticmethod.
 +
 +- Issue #21424: Simplified and optimized heaqp.nlargest() and nmsmallest()
 +  to make fewer tuple comparisons.
 +
 +- Issue #21396: Fix TextIOWrapper(..., write_through=True) to not force a
 +  flush() on the underlying binary stream.  Patch by akira.
 +
 +- Issue #18314: Unlink now removes junctions on Windows. Patch by Kim Gräsman
 +
  - Issue #21088: Bugfix for curses.window.addch() regression in 3.4.0.
    In porting to Argument Clinic, the first two arguments were reversed.