Commit 26a1521e authored by Jason R. Coombs's avatar Jason R. Coombs

Remove remaining reference to setuptools from test_resources

parent ba833672
...@@ -52,6 +52,8 @@ if PY3: ...@@ -52,6 +52,8 @@ if PY3:
else: else:
string_types = str, eval('unicode') string_types = str, eval('unicode')
iteritems = (lambda i: i.items()) if PY3 else lambda i: i.iteritems()
# capture these to bypass sandboxing # capture these to bypass sandboxing
from os import utime from os import utime
try: try:
......
...@@ -12,7 +12,6 @@ from pkg_resources import (parse_requirements, VersionConflict, parse_version, ...@@ -12,7 +12,6 @@ from pkg_resources import (parse_requirements, VersionConflict, parse_version,
packaging = pkg_resources.packaging packaging = pkg_resources.packaging
from setuptools.compat import iteritems
def safe_repr(obj, short=False): def safe_repr(obj, short=False):
""" copied from Python2.7""" """ copied from Python2.7"""
...@@ -259,7 +258,7 @@ class TestEntryPoints: ...@@ -259,7 +258,7 @@ class TestEntryPoints:
def checkSubMap(self, m): def checkSubMap(self, m):
assert len(m) == len(self.submap_expect) assert len(m) == len(self.submap_expect)
for key, ep in iteritems(self.submap_expect): for key, ep in pkg_resources.iteritems(self.submap_expect):
assert repr(m.get(key)) == repr(ep) assert repr(m.get(key)) == repr(ep)
submap_expect = dict( submap_expect = dict(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment