Avoid mixing % and format in same statement
This commit is contained in:
parent
cf423440f6
commit
4cf0d0809f
|
@ -375,7 +375,7 @@ def main():
|
||||||
package_name_parts = args.package_name.rpartition('+')
|
package_name_parts = args.package_name.rpartition('+')
|
||||||
extras_subpackage = package_name_parts[2].lower() or None
|
extras_subpackage = package_name_parts[2].lower() or None
|
||||||
|
|
||||||
namespace = (args.namespace + "(%s)") if args.namespace else "%s"
|
namespace = (args.namespace + "({})") if args.namespace else "{}"
|
||||||
|
|
||||||
for f in (args.files or stdin.readlines()):
|
for f in (args.files or stdin.readlines()):
|
||||||
f = f.strip()
|
f = f.strip()
|
||||||
|
@ -433,31 +433,31 @@ def main():
|
||||||
extras_suffix = f"[{extras_subpackage}]" if extras_subpackage else ""
|
extras_suffix = f"[{extras_subpackage}]" if extras_subpackage else ""
|
||||||
# If egg/dist metadata says package name is python, we provide python(abi)
|
# If egg/dist metadata says package name is python, we provide python(abi)
|
||||||
if dist.normalized_name == 'python':
|
if dist.normalized_name == 'python':
|
||||||
name = namespace % 'python(abi)'
|
name = namespace.format('python(abi)')
|
||||||
if name not in py_deps:
|
if name not in py_deps:
|
||||||
py_deps[name] = []
|
py_deps[name] = []
|
||||||
py_deps[name].append(('==', dist.py_version))
|
py_deps[name].append(('==', dist.py_version))
|
||||||
if not args.legacy or not args.majorver_only:
|
if not args.legacy or not args.majorver_only:
|
||||||
if normalized_names_provide_legacy:
|
if normalized_names_provide_legacy:
|
||||||
name = namespace % 'python{}dist({}{})'.format(dist.py_version, dist.legacy_normalized_name, extras_suffix)
|
name = namespace.format('python{}dist({}{})').format(dist.py_version, dist.legacy_normalized_name, extras_suffix)
|
||||||
if name not in py_deps:
|
if name not in py_deps:
|
||||||
py_deps[name] = []
|
py_deps[name] = []
|
||||||
if normalized_names_provide_pep503:
|
if normalized_names_provide_pep503:
|
||||||
name_ = namespace % 'python{}dist({}{})'.format(dist.py_version, dist.normalized_name, extras_suffix)
|
name_ = namespace.format('python{}dist({}{})').format(dist.py_version, dist.normalized_name, extras_suffix)
|
||||||
if name_ not in py_deps:
|
if name_ not in py_deps:
|
||||||
py_deps[name_] = []
|
py_deps[name_] = []
|
||||||
if args.majorver_provides or args.majorver_only or \
|
if args.majorver_provides or args.majorver_only or \
|
||||||
(args.majorver_provides_versions and dist.py_version in args.majorver_provides_versions):
|
(args.majorver_provides_versions and dist.py_version in args.majorver_provides_versions):
|
||||||
if normalized_names_provide_legacy:
|
if normalized_names_provide_legacy:
|
||||||
pymajor_name = namespace % 'python{}dist({}{})'.format(pyver_major, dist.legacy_normalized_name, extras_suffix)
|
pymajor_name = namespace.format('python{}dist({}{})').format(pyver_major, dist.legacy_normalized_name, extras_suffix)
|
||||||
if pymajor_name not in py_deps:
|
if pymajor_name not in py_deps:
|
||||||
py_deps[pymajor_name] = []
|
py_deps[pymajor_name] = []
|
||||||
if normalized_names_provide_pep503:
|
if normalized_names_provide_pep503:
|
||||||
pymajor_name_ = namespace % 'python{}dist({}{})'.format(pyver_major, dist.normalized_name, extras_suffix)
|
pymajor_name_ = namespace.format('python{}dist({}{})').format(pyver_major, dist.normalized_name, extras_suffix)
|
||||||
if pymajor_name_ not in py_deps:
|
if pymajor_name_ not in py_deps:
|
||||||
py_deps[pymajor_name_] = []
|
py_deps[pymajor_name_] = []
|
||||||
if args.legacy or args.legacy_provides:
|
if args.legacy or args.legacy_provides:
|
||||||
legacy_name = namespace % 'pythonegg({})({})'.format(pyver_major, dist.legacy_normalized_name)
|
legacy_name = namespace.format('pythonegg({})({})').format(pyver_major, dist.legacy_normalized_name)
|
||||||
if legacy_name not in py_deps:
|
if legacy_name not in py_deps:
|
||||||
py_deps[legacy_name] = []
|
py_deps[legacy_name] = []
|
||||||
if dist.version:
|
if dist.version:
|
||||||
|
@ -480,7 +480,7 @@ def main():
|
||||||
if spec not in py_deps[legacy_name]:
|
if spec not in py_deps[legacy_name]:
|
||||||
py_deps[legacy_name].append(spec)
|
py_deps[legacy_name].append(spec)
|
||||||
if args.requires or (args.recommends and dist.extras):
|
if args.requires or (args.recommends and dist.extras):
|
||||||
name = namespace % 'python(abi)'
|
name = namespace.format('python(abi)')
|
||||||
# If egg/dist metadata says package name is python, we don't add dependency on python(abi)
|
# If egg/dist metadata says package name is python, we don't add dependency on python(abi)
|
||||||
if dist.normalized_name == 'python':
|
if dist.normalized_name == 'python':
|
||||||
py_abi = False
|
py_abi = False
|
||||||
|
@ -527,12 +527,12 @@ def main():
|
||||||
dep_normalized_name = dep.legacy_normalized_name
|
dep_normalized_name = dep.legacy_normalized_name
|
||||||
|
|
||||||
if args.legacy:
|
if args.legacy:
|
||||||
name = namespace % 'pythonegg({})({})'.format(pyver_major, dep.legacy_normalized_name)
|
name = namespace.format('pythonegg({})({})').format(pyver_major, dep.legacy_normalized_name)
|
||||||
else:
|
else:
|
||||||
if args.majorver_only:
|
if args.majorver_only:
|
||||||
name = namespace % 'python{}dist({}{})'.format(pyver_major, dep_normalized_name, extras_suffix)
|
name = namespace.format('python{}dist({}{})').format(pyver_major, dep_normalized_name, extras_suffix)
|
||||||
else:
|
else:
|
||||||
name = namespace % 'python{}dist({}{})'.format(dist.py_version, dep_normalized_name, extras_suffix)
|
name = namespace.format('python{}dist({}{})').format(dist.py_version, dep_normalized_name, extras_suffix)
|
||||||
|
|
||||||
if dep.marker and not args.recommends and not extras_subpackage:
|
if dep.marker and not args.recommends and not extras_subpackage:
|
||||||
if not dep.marker.evaluate(get_marker_env(dist, '')):
|
if not dep.marker.evaluate(get_marker_env(dist, '')):
|
||||||
|
|
Loading…
Reference in New Issue