From 165f95218ab30580eafba4e2571e03ed14ca482f Mon Sep 17 00:00:00 2001 From: Daniel Holth Date: Mon, 27 Aug 2012 19:11:13 -0400 Subject: move Python < 2.6 fallback into _markerlib --HG-- branch : distribute extra : rebase_source : 901265cef35594b3ab20ae4ba3b270a5da6f9ea7 --- pkg_resources.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'pkg_resources.py') diff --git a/pkg_resources.py b/pkg_resources.py index 060db644..a5a10eb4 100644 --- a/pkg_resources.py +++ b/pkg_resources.py @@ -2482,16 +2482,7 @@ class DistInfoDistribution(Distribution): def _compute_dependencies(self): """Recompute this distribution's dependencies.""" - def dummy_marker(marker): - def marker_fn(environment=None, override=None): - # 'empty markers are True' heuristic won't install extra deps. - return not marker.strip() - marker_fn.__doc__ = marker - return marker_fn - try: - from _markerlib import compile as compile_marker - except ImportError: - compile_marker = dummy_marker + from _markerlib import compile as compile_marker dm = self.__dep_map = {None: []} reqs = [] -- cgit v1.2.1