[Python-checkins] bpo-31028: Fix test_pydoc when run directly (#2864) (#2910)

Victor Stinner webhook-mailer at python.org
Thu Jul 27 12:05:49 EDT 2017


https://github.com/python/cpython/commit/d019c7965d411b2132f68ed6bb33e538b4d9eba3
commit: d019c7965d411b2132f68ed6bb33e538b4d9eba3
branch: 3.6
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-07-27T18:05:46+02:00
summary:

bpo-31028: Fix test_pydoc when run directly (#2864) (#2910)

* bpo-31028: Fix test_pydoc when run directly

Fix get_pydoc_link() of test_pydoc to fix "./python
Lib/test/test_pydoc.py": get the absolute path to __file__ to prevent
relative directories.

* Use realpath() instead of abspath()

(cherry picked from commit fd46561167af6cd697191dd7ebb8c2fef5ad6493)

files:
M Lib/test/test_pydoc.py

diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py
index ed438d5664c..0383a673240 100644
--- a/Lib/test/test_pydoc.py
+++ b/Lib/test/test_pydoc.py
@@ -361,7 +361,7 @@ def get_pydoc_html(module):
 def get_pydoc_link(module):
     "Returns a documentation web link of a module"
     dirname = os.path.dirname
-    basedir = dirname(dirname(__file__))
+    basedir = dirname(dirname(os.path.realpath(__file__)))
     doc = pydoc.TextDoc()
     loc = doc.getdocloc(module, basedir=basedir)
     return loc



More information about the Python-checkins mailing list