diff options
| author | Daniel Holth <dholth@fastmail.fm> | 2012-08-27 18:54:29 -0400 |
|---|---|---|
| committer | Daniel Holth <dholth@fastmail.fm> | 2012-08-27 18:54:29 -0400 |
| commit | 9ebbe014df37c19976a5a9cb0ac2fa228a03144a (patch) | |
| tree | 0e16b78ef375b075a480b918052311b614d07659 /pkg_resources.py | |
| parent | 4095eb5d31995c4a80d0a9b5125d8cefbf1d8390 (diff) | |
| download | python-setuptools-git-9ebbe014df37c19976a5a9cb0ac2fa228a03144a.tar.gz | |
impractical to support _markerlib on Python < 2.6 (no compile(ast))
--HG--
branch : distribute
extra : rebase_source : c5019294d83fab26bc393fe72f086d0b13b1e337
Diffstat (limited to 'pkg_resources.py')
| -rw-r--r-- | pkg_resources.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg_resources.py b/pkg_resources.py index 2d7f247e..060db644 100644 --- a/pkg_resources.py +++ b/pkg_resources.py @@ -2489,9 +2489,9 @@ class DistInfoDistribution(Distribution): marker_fn.__doc__ = marker return marker_fn try: - from _markerlib import as_function + from _markerlib import compile as compile_marker except ImportError: - as_function = dummy_marker + compile_marker = dummy_marker dm = self.__dep_map = {None: []} reqs = [] @@ -2499,7 +2499,7 @@ class DistInfoDistribution(Distribution): for req in self._parsed_pkg_info.get_all('Requires-Dist') or []: distvers, mark = self._preparse_requirement(req) parsed = parse_requirements(distvers).next() - parsed.marker_fn = as_function(mark) + parsed.marker_fn = compile_marker(mark) reqs.append(parsed) def reqs_for_extra(extra): |