From 8ce73d4450eb646b80c004e57b82ed9eabe24f35 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Thu, 7 Apr 2016 22:24:53 +0100 Subject: Rely on short-circuit in 'or' rather than building a separate iterable. --- pkg_resources/__init__.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'pkg_resources/__init__.py') diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py index 04064d5a..ab48cf7a 100644 --- a/pkg_resources/__init__.py +++ b/pkg_resources/__init__.py @@ -35,7 +35,6 @@ import plistlib import email.parser import tempfile import textwrap -import itertools from pkgutil import get_importer try: @@ -991,13 +990,7 @@ class _ReqExtras(dict): req.marker.evaluate({'extra': extra}) for extra in self.get(req, ()) ) - # set up a late-evaluated simple marker evaluation. - simple_eval = ( - req.marker.evaluate() - for _ in (None,) - ) - evals = itertools.chain(extra_evals, simple_eval) - return not req.marker or any(evals) + return not req.marker or any(extra_evals) or req.marker.evaluate() class Environment(object): -- cgit v1.2.3