summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTarek Ziade <tarek@ziade.org>2011-05-21 14:24:14 +0200
committerTarek Ziade <tarek@ziade.org>2011-05-21 14:24:14 +0200
commit2db5674a95fe1a65a3594c3bb5431beced22e240 (patch)
treec13ba35bda41807262194e698c2c01544477ba57
parent95c7c46077864f6ae9ac6dd1eaf4d79452e7aeb2 (diff)
downloadcpython-git-2db5674a95fe1a65a3594c3bb5431beced22e240.tar.gz
we want to generate /-separated paths setup.cfg files even under win32
-rw-r--r--Lib/packaging/create.py20
1 files changed, 13 insertions, 7 deletions
diff --git a/Lib/packaging/create.py b/Lib/packaging/create.py
index 5432ffcf2c..b96aef0fe7 100644
--- a/Lib/packaging/create.py
+++ b/Lib/packaging/create.py
@@ -383,19 +383,25 @@ class MainProgram:
path_tokens.sort(key=cmp_to_key(length_comparison))
for dest, srcs in (dist.data_files or []):
dest = os.path.join(sys.prefix, dest)
+ dest = dest.replace(os.path.sep, '/')
for tok, path in path_tokens:
- if dest.startswith(path):
- dest = ('{%s}' % tok) + dest[len(path):]
- files = [('/ '.join(src.rsplit('/', 1)), dest)
- for src in srcs]
- data['resources'].extend(files)
+ path = path.replace(os.path.sep, '/')
+ if not dest.startswith(path):
continue
+
+ dest = ('{%s}' % tok) + dest[len(path):]
+ files = [('/ '.join(src.rsplit('/', 1)), dest)
+ for src in srcs]
+ data['resources'].extend(files)
+
# 2.2 package_data -> extra_files
package_dirs = dist.package_dir or {}
for package, extras in iter(dist.package_data.items()) or []:
package_dir = package_dirs.get(package, package)
- files = [os.path.join(package_dir, f) for f in extras]
- data['extra_files'].extend(files)
+ for file_ in extras:
+ if package_dir:
+ file_ = package_dir + '/' + file_
+ data['extra_files'].append(file_)
# Use README file if its content is the desciption
if "description" in data: