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

Merge 3.5

This commit is contained in:
Victor Stinner 2016-03-25 12:50:54 +01:00
parent 931602a1ac 84ca9fe145
commit 6384c66d1f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/doctest.py
View File

@ -399,8 +399,9 @@ def _module_relative_path(module, path):
basedir = os.curdir basedir = os.curdir
else: else:
# A module w/o __file__ (this includes builtins) # A module w/o __file__ (this includes builtins)
raise ValueError("Can't resolve paths relative to the module " + raise ValueError("Can't resolve paths relative to the module "
module + " (it has no __file__)") "%r (it has no __file__)"
% module.__name__)
# Combine the base directory and the path. # Combine the base directory and the path.
return os.path.join(basedir, *(path.split('/'))) return os.path.join(basedir, *(path.split('/')))