diff options
| author | Daniel Holth <dholth@fastmail.fm> | 2012-08-27 19:11:13 -0400 |
|---|---|---|
| committer | Daniel Holth <dholth@fastmail.fm> | 2012-08-27 19:11:13 -0400 |
| commit | 165f95218ab30580eafba4e2571e03ed14ca482f (patch) | |
| tree | eeebebda4a94d3d4409222378d9dca992da31316 /pkg_resources.py | |
| parent | 9ebbe014df37c19976a5a9cb0ac2fa228a03144a (diff) | |
| download | python-setuptools-git-165f95218ab30580eafba4e2571e03ed14ca482f.tar.gz | |
move Python < 2.6 fallback into _markerlib
--HG--
branch : distribute
extra : rebase_source : 901265cef35594b3ab20ae4ba3b270a5da6f9ea7
Diffstat (limited to 'pkg_resources.py')
| -rw-r--r-- | pkg_resources.py | 11 |
1 files changed, 1 insertions, 10 deletions
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 = [] |
