summaryrefslogtreecommitdiffstats
path: root/Lib/pydoc.py
diff options
context:
space:
mode:
authorCheryl Sabella <cheryl.sabella@gmail.com>2019-05-24 10:43:29 (GMT)
committerGitHub <noreply@github.com>2019-05-24 10:43:29 (GMT)
commitc95c93d4eb0519beaa06e6b6e0ecca7c2a58f69c (patch)
tree700a509aba514a0011d6c786874d79df7dae5081 /Lib/pydoc.py
parentf1e17e9f97d9a4e97a5d99574775ee343a3a74fb (diff)
downloadcpython-c95c93d4eb0519beaa06e6b6e0ecca7c2a58f69c.zip
cpython-c95c93d4eb0519beaa06e6b6e0ecca7c2a58f69c.tar.gz
cpython-c95c93d4eb0519beaa06e6b6e0ecca7c2a58f69c.tar.bz2
bpo-20285: Improve help docs for object (GH-4759)
Diffstat (limited to 'Lib/pydoc.py')
-rw-r--r--Lib/pydoc.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index 86ccfe0..679a596 100644
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -867,7 +867,7 @@ class HTMLDoc(Doc):
thisclass = attrs[0][2]
attrs, inherited = _split_list(attrs, lambda t: t[2] is thisclass)
- if thisclass is builtins.object:
+ if object is not builtins.object and thisclass is builtins.object:
attrs = inherited
continue
elif thisclass is object:
@@ -1327,7 +1327,7 @@ location listed above.
thisclass = attrs[0][2]
attrs, inherited = _split_list(attrs, lambda t: t[2] is thisclass)
- if thisclass is builtins.object:
+ if object is not builtins.object and thisclass is builtins.object:
attrs = inherited
continue
elif thisclass is object: