aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/dist.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2017-07-13 21:31:31 -0400
committerJason R. Coombs <jaraco@jaraco.com>2017-07-13 21:31:31 -0400
commitdfe339ec3b1c2d0f463ed39f86c34c01ff8faedc (patch)
tree6f0695b29ceed0a78d56f457f265f51acfb0db4c /setuptools/dist.py
parent8c00a37662c6f2ff3814d75d5569c02f83e411a1 (diff)
downloadexternal_python_setuptools-dfe339ec3b1c2d0f463ed39f86c34c01ff8faedc.tar.gz
external_python_setuptools-dfe339ec3b1c2d0f463ed39f86c34c01ff8faedc.tar.bz2
external_python_setuptools-dfe339ec3b1c2d0f463ed39f86c34c01ff8faedc.zip
Use better variable names and the partition method for simplicity.
Diffstat (limited to 'setuptools/dist.py')
-rw-r--r--setuptools/dist.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 1a475ed0..5adbfd4e 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -140,19 +140,18 @@ def check_extras(dist, attr, value):
)
-def _check_extra(k, v):
- if ':' in k:
- k, m = k.split(':', 1)
- if pkg_resources.invalid_marker(m):
- raise DistutilsSetupError("Invalid environment marker: " + m)
+def _check_extra(extra, reqs):
+ name, sep, marker = extra.partition(':')
+ if marker and pkg_resources.invalid_marker(marker):
+ raise DistutilsSetupError("Invalid environment marker: " + marker)
- for r in pkg_resources.parse_requirements(v):
+ for r in pkg_resources.parse_requirements(reqs):
if r.marker:
tmpl = (
"'extras_require' requirements cannot include "
"environment markers, in {section!r}: '{req!s}'"
)
- raise DistutilsSetupError(tmpl.format(section=k, req=r))
+ raise DistutilsSetupError(tmpl.format(section=name, req=r))
def assert_bool(dist, attr, value):