From: Xiang Zhang <angwerzx@126.com>
Date: Sun, 22 Jan 2017 06:39:20 +0000 (+0800)
Subject: Issue #29290: Merge 3.5.
X-Git-Tag: v3.6.1rc1~152
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b1681189af1157d9b6161c8a3a645c2eb816b415;p=python

Issue #29290: Merge 3.5.
---

b1681189af1157d9b6161c8a3a645c2eb816b415
diff --cc Misc/NEWS
index d829a56b28,d2a8390545..c72755915e
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -47,10 -13,12 +47,13 @@@ 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 #29011: Fix an important omission by adding Deque to the typing module.
 +- Issue #29316: Restore the provisional status of typing module, add
 +  corresponding note to documentation. Patch by Ivan L.
  
  - Issue #29219: Fixed infinite recursion in the repr of uninitialized
    ctypes.CDLL instances.