summaryrefslogtreecommitdiff
path: root/pkg_resources.py
diff options
context:
space:
mode:
authorDaniel Holth <dholth@fastmail.fm>2012-06-29 04:11:44 -0400
committerDaniel Holth <dholth@fastmail.fm>2012-06-29 04:11:44 -0400
commit07f0901db42f1bc5d411868e92e7e77d27f90323 (patch)
tree6bb7f0ea9eab2005241f53acb711b5193f6b7a9c /pkg_resources.py
parentac2bc6ee75884f521d9097b83315adf413ff2a7c (diff)
downloadpython-setuptools-git-07f0901db42f1bc5d411868e92e7e77d27f90323.tar.gz
use markerlib
--HG-- branch : distribute extra : rebase_source : a684fafb1aeb44954bdb8604a77fcc8d1549648c
Diffstat (limited to 'pkg_resources.py')
-rw-r--r--pkg_resources.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg_resources.py b/pkg_resources.py
index 5e3967f3..dea54490 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -2474,7 +2474,7 @@ class DistInfoDistribution(Distribution):
return True
return marker_fn
try:
- from wheel.markers import as_function
+ from markerlib import as_function
except ImportError:
as_function = dummy_marker
dm = self.__dep_map = {None: []}