diff options
| author | Daniel Holth <dholth@fastmail.fm> | 2012-08-25 15:26:08 -0400 |
|---|---|---|
| committer | Daniel Holth <dholth@fastmail.fm> | 2012-08-25 15:26:08 -0400 |
| commit | 776fdebc918822b57286ac7a2107f8766f43ce56 (patch) | |
| tree | 956ab58be2c232dbf2fcc0bde3ec8d8e23369dc6 /pkg_resources.py | |
| parent | 977f4db35a9390a3e10cd184f69fb2d42886b639 (diff) | |
| download | external_python_setuptools-776fdebc918822b57286ac7a2107f8766f43ce56.tar.gz external_python_setuptools-776fdebc918822b57286ac7a2107f8766f43ce56.tar.bz2 external_python_setuptools-776fdebc918822b57286ac7a2107f8766f43ce56.zip | |
add markerlib as _markerlib
--HG--
branch : distribute
extra : rebase_source : b9d8fa81db6c6fc3d89db54a70778eb3e8396e17
Diffstat (limited to 'pkg_resources.py')
| -rw-r--r-- | pkg_resources.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg_resources.py b/pkg_resources.py index ca0f21c4..63d18977 100644 --- a/pkg_resources.py +++ b/pkg_resources.py @@ -1746,7 +1746,7 @@ def find_on_path(importer, path_item, only=False): # scan for .egg and .egg-info in directory for entry in os.listdir(path_item): lower = entry.lower() - if lower.endswith('.egg-info') or lower.endswith('.dist-info'): + if lower.endswith(('.egg-info', '.dist-info')): fullpath = os.path.join(path_item, entry) if os.path.isdir(fullpath): # egg-info directory, allow getting metadata @@ -2489,7 +2489,7 @@ class DistInfoDistribution(Distribution): marker_fn.__doc__ = marker return marker_fn try: - from markerlib import as_function + from _markerlib import as_function except ImportError: as_function = dummy_marker dm = self.__dep_map = {None: []} |