summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-10-29 06:15:50 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2015-10-29 06:15:50 (GMT)
commitac4bdcc80e986bdd5b9d10ab0bce35aabb790a3e (patch)
treeab7584880b723f516f0ac580241396e850128a63 /Lib/test
parentf8152c67f52874cd4aa63f1cb3e1216382f98057 (diff)
downloadcpython-ac4bdcc80e986bdd5b9d10ab0bce35aabb790a3e.zip
cpython-ac4bdcc80e986bdd5b9d10ab0bce35aabb790a3e.tar.gz
cpython-ac4bdcc80e986bdd5b9d10ab0bce35aabb790a3e.tar.bz2
Issue #25503: Fixed inspect.getdoc() for inherited docstrings of properties.
Original patch by John Mark Vandenberg.
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/inspect_fodder.py7
-rw-r--r--Lib/test/test_inspect.py4
2 files changed, 8 insertions, 3 deletions
diff --git a/Lib/test/inspect_fodder.py b/Lib/test/inspect_fodder.py
index 068d825..711bada 100644
--- a/Lib/test/inspect_fodder.py
+++ b/Lib/test/inspect_fodder.py
@@ -45,14 +45,17 @@ class StupidGit:
self.ex = sys.exc_info()
self.tr = inspect.trace()
+ @property
def contradiction(self):
'The automatic gainsaying.'
pass
-# line 48
+# line 53
class MalodorousPervert(StupidGit):
def abuse(self, a, b, c):
pass
+
+ @property
def contradiction(self):
pass
@@ -64,6 +67,8 @@ class ParrotDroppings:
class FesteringGob(MalodorousPervert, ParrotDroppings):
def abuse(self, a, b, c):
pass
+
+ @property
def contradiction(self):
pass
diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
index 955b2ad..69ddb51 100644
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -393,8 +393,8 @@ class TestRetrievingSourceCode(GetSourceBase):
def test_getsource(self):
self.assertSourceEqual(git.abuse, 29, 39)
- self.assertSourceEqual(mod.StupidGit, 21, 50)
- self.assertSourceEqual(mod.lobbest, 70, 71)
+ self.assertSourceEqual(mod.StupidGit, 21, 51)
+ self.assertSourceEqual(mod.lobbest, 75, 76)
def test_getsourcefile(self):
self.assertEqual(normcase(inspect.getsourcefile(mod.spam)), modfile)