traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove duplicated code in pydoc.py, probably a merge conflict some months ago. 

Spotted by Humberto Diogenes.
This commit is contained in:
Amaury Forgeot d'Arc 2008-04-25 20:47:52 +00:00
parent e41251e864
commit cef5b3d411
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Lib/pydoc.py
View File

@ -1500,23 +1500,6 @@ def render_doc(thing, title='Python Library Documentation: %s', forceload=0):
def doc(thing, title='Python Library Documentation: %s', forceload=0): def doc(thing, title='Python Library Documentation: %s', forceload=0):
"""Display text documentation, given an object or a path to an object.""" """Display text documentation, given an object or a path to an object."""
try: try:
object, name = resolve(thing, forceload)
desc = describe(object)
module = inspect.getmodule(object)
if name and '.' in name:
desc += ' in ' + name[:name.rfind('.')]
elif module and module is not object:
desc += ' in module ' + module.__name__
elif not (inspect.ismodule(object) or
inspect.isclass(object) or
inspect.isroutine(object) or
inspect.isgetsetdescriptor(object) or
inspect.ismemberdescriptor(object) or
isinstance(object, property)):
# If the passed object is a piece of data or an instance,
# document its available methods instead of its value.
object = type(object)
desc += ' object'
pager(render_doc(thing, title, forceload)) pager(render_doc(thing, title, forceload))
except (ImportError, ErrorDuringImport) as value: except (ImportError, ErrorDuringImport) as value:
print(value) print(value)