From 7fe28ad8375677a6d696271d48783d6c38a74dce Mon Sep 17 00:00:00 2001
From: Xiang Zhang <angwerzx@126.com>
Date: Sun, 22 Jan 2017 14:37:22 +0800
Subject: [PATCH] Issue #29290: argparse help messages won't wrap at
 non-breaking spaces.

---
 Lib/argparse.py           |  2 +-
 Lib/test/test_argparse.py | 17 +++++++++++++++++
 Misc/NEWS                 |  5 ++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/Lib/argparse.py b/Lib/argparse.py
index 9a067196dac..0d881b8d3ef 100644
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -176,7 +176,7 @@ class HelpFormatter(object):
         self._root_section = self._Section(self, None)
         self._current_section = self._root_section
 
-        self._whitespace_matcher = _re.compile(r'\s+')
+        self._whitespace_matcher = _re.compile(r'\s+', _re.ASCII)
         self._long_break_matcher = _re.compile(r'\n\n\n+')
 
     # ===============================
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
index 4779a133012..197d576eb66 100644
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -1943,6 +1943,23 @@ class TestAddSubparsers(TestCase):
               ++foo       foo help
             '''))
 
+    def test_help_non_breaking_spaces(self):
+        parser = ErrorRaisingArgumentParser(
+            prog='PROG', description='main description')
+        parser.add_argument(
+            "--non-breaking", action='store_false',
+            help='help message containing non-breaking spaces shall not '
+            'wrap\N{NO-BREAK SPACE}at non-breaking spaces')
+        self.assertEqual(parser.format_help(), textwrap.dedent('''\
+            usage: PROG [-h] [--non-breaking]
+
+            main description
+
+            optional arguments:
+              -h, --help      show this help message and exit
+              --non-breaking  help message containing non-breaking spaces shall not
+                              wrap\N{NO-BREAK SPACE}at non-breaking spaces
+        '''))
 
     def test_help_alternate_prefix_chars(self):
         parser = self._get_parser(prefix_chars='+:/')
diff --git a/Misc/NEWS b/Misc/NEWS
index 84fa9d1b9fd..d2a83905454 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,9 +13,12 @@ Core and Builtins
 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 #29011: Fix an important omission by adding Deque to the typing module.
 
 - Issue #29219: Fixed infinite recursion in the repr of uninitialized
   ctypes.CDLL instances.