summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_pydoc.py
diff options
context:
space:
mode:
authorLarry Hastings <larry@hastings.org>2016-06-13 03:26:28 (GMT)
committerLarry Hastings <larry@hastings.org>2016-06-13 03:26:28 (GMT)
commit29f963732166260420ffbdebe9eb8b98a009dc8c (patch)
tree17ad6530ee3b66b53647ab70bac08145dcd69783 /Lib/test/test_pydoc.py
parent6e9a96be9e24265638df8aa600e566b306a23a2b (diff)
parent1003b34c71d53ccb88ae2768aaba503ae6b5bc16 (diff)
downloadcpython-29f963732166260420ffbdebe9eb8b98a009dc8c.zip
cpython-29f963732166260420ffbdebe9eb8b98a009dc8c.tar.gz
cpython-29f963732166260420ffbdebe9eb8b98a009dc8c.tar.bz2
Merge 3.5.2rc1 with current 3.5 branch.
Diffstat (limited to 'Lib/test/test_pydoc.py')
-rw-r--r--Lib/test/test_pydoc.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py
index 59aa715..aee979b 100644
--- a/Lib/test/test_pydoc.py
+++ b/Lib/test/test_pydoc.py
@@ -356,7 +356,7 @@ def get_pydoc_html(module):
def get_pydoc_link(module):
"Returns a documentation web link of a module"
dirname = os.path.dirname
- basedir = os.path.join(dirname(dirname(__file__)))
+ basedir = dirname(dirname(__file__))
doc = pydoc.TextDoc()
loc = doc.getdocloc(module, basedir=basedir)
return loc