summaryrefslogtreecommitdiff
path: root/Lib/pydoc.py
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-10-06 18:52:52 +0300
committerSerhiy Storchaka <storchaka@gmail.com>2015-10-06 18:52:52 +0300
commitfc632e3912ba9bb6ec20359148f05ca3ec231663 (patch)
tree9615a94c00877cd8a21a689081659272ed2d35b9 /Lib/pydoc.py
parentd7e60b151978bca31b74998398302247056c975b (diff)
parenta3a19953e04cbee3da562164aec56ca25846d02d (diff)
downloadcpython-git-fc632e3912ba9bb6ec20359148f05ca3ec231663.tar.gz
Merge with 3.5.
Diffstat (limited to 'Lib/pydoc.py')
-rw-r--r--[-rwxr-xr-x]Lib/pydoc.py0
1 files changed, 0 insertions, 0 deletions
diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index f4f253010f..f4f253010f 100755..100644
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py