diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-04-15 09:03:49 +0200 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-04-15 09:03:49 +0200 |
| commit | dd5caefb987dbd15495047fc653fa71d4667eb43 (patch) | |
| tree | e79461dbd70903addafc07aafe84a44eb397ba82 /pkg_resources/__init__.py | |
| parent | bc35160987a7dda23de0c898a7e8ae4363504cde (diff) | |
| download | python-setuptools-git-dd5caefb987dbd15495047fc653fa71d4667eb43.tar.gz | |
Always inject extra into the environment when evaluating markers. Fixes #544.
Diffstat (limited to 'pkg_resources/__init__.py')
| -rw-r--r-- | pkg_resources/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py index ce4e7755..2eab8230 100644 --- a/pkg_resources/__init__.py +++ b/pkg_resources/__init__.py @@ -988,9 +988,9 @@ class _ReqExtras(dict): """ extra_evals = ( req.marker.evaluate({'extra': extra}) - for extra in self.get(req, ()) + for extra in self.get(req, ()) + (None,) ) - return not req.marker or any(extra_evals) or req.marker.evaluate() + return not req.marker or any(extra_evals) class Environment(object): |