From: Xiang Zhang <angwerzx@126.com>
Date: Sun, 22 Jan 2017 06:41:42 +0000 (+0800)
Subject: Issue #29290: Merge 3.6.
X-Git-Tag: v3.7.0a1~1491
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d528791096694307884762eebc8ec6fed279f302;p=thirdparty%2FPython%2Fcpython.git

Issue #29290: Merge 3.6.
---

d528791096694307884762eebc8ec6fed279f302
diff --cc Misc/NEWS
index 6c2b43500f7e,c72755915e02..efd8e3263554
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -215,12 -47,13 +215,15 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #29290: Fix a regression in argparse that help messages would wrap at
+   non-breaking spaces.
+ 
  - Issue #28735: Fixed the comparison of mock.MagickMock with mock.ANY.
  
 -- Issue #29316: Restore the provisional status of typing module, add
 -  corresponding note to documentation. Patch by Ivan L.
 +- Issue #29197: Removed deprecated function ntpath.splitunc().
 +
 +- Issue #29210: Removed support of deprecated argument "exclude" in
 +  tarfile.TarFile.add().
  
  - Issue #29219: Fixed infinite recursion in the repr of uninitialized
    ctypes.CDLL instances.