bpo-40257: Revert changes to inspect.getdoc() (GH-20073)

1 files changed, 3 insertions, 12 deletions

diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
index 98a9c0a662..e3e2be5207 100644
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -439,7 +439,8 @@ class TestRetrievingSourceCode(GetSourceBase):
     @unittest.skipIf(sys.flags.optimize >= 2,
                      "Docstrings are omitted with -O2 and above")
     def test_getdoc_inherited(self):
-        self.assertIsNone(inspect.getdoc(mod.FesteringGob))
+        self.assertEqual(inspect.getdoc(mod.FesteringGob),
+                         'A longer,\n\nindented\n\ndocstring.')
         self.assertEqual(inspect.getdoc(mod.FesteringGob.abuse),
                          'Another\n\ndocstring\n\ncontaining\n\ntabs')
         self.assertEqual(inspect.getdoc(mod.FesteringGob().abuse),
@@ -448,19 +449,9 @@ class TestRetrievingSourceCode(GetSourceBase):
                          'The automatic gainsaying.')
 
     @unittest.skipIf(MISSING_C_DOCSTRINGS, "test requires docstrings")
-    def test_getowndoc(self):
-        getowndoc = inspect._getowndoc
-        self.assertEqual(getowndoc(type), type.__doc__)
-        self.assertEqual(getowndoc(int), int.__doc__)
-        self.assertEqual(getowndoc(int.to_bytes), int.to_bytes.__doc__)
-        self.assertEqual(getowndoc(int().to_bytes), int.to_bytes.__doc__)
-        self.assertEqual(getowndoc(int.from_bytes), int.from_bytes.__doc__)
-        self.assertEqual(getowndoc(int.real), int.real.__doc__)
-
-    @unittest.skipIf(MISSING_C_DOCSTRINGS, "test requires docstrings")
     def test_finddoc(self):
         finddoc = inspect._finddoc
-        self.assertIsNone(finddoc(int))
+        self.assertEqual(finddoc(int), int.__doc__)
         self.assertEqual(finddoc(int.to_bytes), int.to_bytes.__doc__)
         self.assertEqual(finddoc(int().to_bytes), int.to_bytes.__doc__)
         self.assertEqual(finddoc(int.from_bytes), int.from_bytes.__doc__)