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

fixed the separator issues in packaging/resources+config

This commit is contained in:
Tarek Ziade 2011-05-21 11:48:16 +02:00
parent 94449616da
commit ec9b76d282
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/packaging/config.py
View File

@ -33,6 +33,9 @@ def _pop_values(values_dct, key):
def _rel_path(base, path):
# normalizes and returns a lstripped-/-separated path
base = base.replace(os.path.sep, '/')
path = path.replace(os.path.sep, '/')
assert path.startswith(base)
return path[len(base):].lstrip('/')
@ -50,7 +53,8 @@ def get_resources_dests(resources_root, rules):
destinations.pop(resource_file, None)
else:
rel_path = _rel_path(abs_base, abs_path)
destinations[resource_file] = os.path.join(dest, rel_path)
rel_dest = dest.replace(os.path.sep, '/').rstrip('/')
destinations[resource_file] = rel_dest + '/' + rel_path
return destinations

1
Lib/packaging/tests/test_resources.py
View File

@ -25,7 +25,6 @@ class DataFilesTestCase(GlobTestCaseBase):
files = {}
for path, value in spec.items():
if value is not None:
path = self.os_dependent_path(path)
files[path] = value
return files

4
Lib/packaging/util.py
View File

@ -939,7 +939,7 @@ class Mixin2to3:
self.options, self.explicit)
RICH_GLOB = re.compile(r'\{([^}]*)\}')
_CHECK_RECURSIVE_GLOB = re.compile(r'[^/,{]\*\*|\*\*[^/,}]')
_CHECK_RECURSIVE_GLOB = re.compile(r'[^/\\,{]\*\*|\*\*[^/\\,}]')
_CHECK_MISMATCH_SET = re.compile(r'^[^{]*\}|\{[^}]*$')
@ -973,7 +973,9 @@ def _iglob(path_glob):
if radical == '':
radical = '*'
else:
# we support both
radical = radical.lstrip('/')
radical = radical.lstrip('\\')
for path, dir, files in os.walk(prefix):
path = os.path.normpath(path)
for file in _iglob(os.path.join(path, radical)):