From 032de7324e30c6b44ef272cea3be205a3d768759 Mon Sep 17 00:00:00 2001
From: Steve Cirelli <scirelli+git@gmail.com>
Date: Mon, 3 Feb 2020 02:06:50 -0500
Subject: [PATCH] bpo-39450 Stripped whitespace before parsing the docstring in
 TestCase.shortDescription (GH-18175)

---
 Lib/unittest/case.py                                     | 2 +-
 Lib/unittest/test/test_case.py                           | 9 +++++++++
 .../Library/2020-02-02-14-46-34.bpo-39450.48R274.rst     | 2 ++
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 Misc/NEWS.d/next/Library/2020-02-02-14-46-34.bpo-39450.48R274.rst

diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index fa64a6ea237..5e5d535dc69 100644
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -512,7 +512,7 @@ class TestCase(object):
         the specified test method's docstring.
         """
         doc = self._testMethodDoc
-        return doc and doc.split("\n")[0].strip() or None
+        return doc.strip().split("\n")[0].strip() if doc else None
 
 
     def id(self):
diff --git a/Lib/unittest/test/test_case.py b/Lib/unittest/test/test_case.py
index c2401c39b91..f855c4dc00b 100644
--- a/Lib/unittest/test/test_case.py
+++ b/Lib/unittest/test/test_case.py
@@ -610,6 +610,15 @@ class Test_TestCase(unittest.TestCase, TestEquality, TestHashing):
                  'Tests shortDescription() for a method with a longer '
                  'docstring.')
 
+    def testShortDescriptionWhitespaceTrimming(self):
+        """
+            Tests shortDescription() whitespace is trimmed, so that the first
+            line of nonwhite-space text becomes the docstring.
+        """
+        self.assertEqual(
+            self.shortDescription(),
+            'Tests shortDescription() whitespace is trimmed, so that the first')
+
     def testAddTypeEqualityFunc(self):
         class SadSnake(object):
             """Dummy class for test_addTypeEqualityFunc."""
diff --git a/Misc/NEWS.d/next/Library/2020-02-02-14-46-34.bpo-39450.48R274.rst b/Misc/NEWS.d/next/Library/2020-02-02-14-46-34.bpo-39450.48R274.rst
new file mode 100644
index 00000000000..55fed519a2d
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-02-02-14-46-34.bpo-39450.48R274.rst
@@ -0,0 +1,2 @@
+Striped whitespace from docstring before returning it from
+:func:`unittest.case.shortDescription`.