mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Have importlib look for pre-existing path separators when joining

Browse source 
paths.
This commit is contained in:
Brett Cannon 2012-04-21 21:21:27 -04:00
parent cb165db3a3
commit 0d05a7698b
2 changed files with 3023 additions and 3011 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/importlib/_bootstrap.py
View file

@ -63,8 +63,16 @@ def _r_long(int_bytes):
def _path_join(*args):
"""Replacement for os.path.join()."""
sep = path_sep if args[0][-1:] not in path_separators else args[0][-1]
return sep.join(x[:-len(path_sep)] if x.endswith(path_sep) else x
if len(path_separators) == 1:
sep = path_sep
else:
for c in reversed(args[0]):
if x in path_separators:
sep = x
break
else:
sep = path_sep
return sep.join(x[:-len(sep)] if x.endswith(sep) else x
for x in args if x)