Browse Source

Revert to os.path.join() semantics for path manipulation in importlib

which is different than what imp.cache_from_source() operates on.
pull/2332/head
Brett Cannon 14 years ago
parent
commit
cf649958f7
  1. 13
      Lib/importlib/_bootstrap.py
  2. 5938
      Python/importlib.h

13
Lib/importlib/_bootstrap.py

@ -65,17 +65,8 @@ def _r_long(int_bytes):
# and choosing in _setup().
def _path_join(*args):
"""Replacement for os.path.join()."""
if len(path_separators) == 1:
sep = path_sep
else:
for x 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)
return path_sep.join(x[:-len(path_sep)] if x.endswith(path_sep) else x
for x in args if x)
def _path_split(path):

5938
Python/importlib.h
File diff suppressed because it is too large
View File

Loading…
Cancel
Save