diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2015-12-31 10:51:55 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-12-31 10:51:55 -0500 |
| commit | 2a73c2660c1cd127d93c5c5d75d06a3afca2c39d (patch) | |
| tree | c15c2bf16d898da90f4c75522c3babfeab704b4f /pkg_resources | |
| parent | 61b2b708a0bab7a6987049c4eee9552408bc8f20 (diff) | |
| parent | 6cee285479a11424803d4dc3e64be8019f343c13 (diff) | |
| download | python-setuptools-bitbucket-2a73c2660c1cd127d93c5c5d75d06a3afca2c39d.tar.gz | |
Merge with master. Ref #229.
Diffstat (limited to 'pkg_resources')
| -rw-r--r-- | pkg_resources/tests/test_resources.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py index a55478a2..92d0e49c 100644 --- a/pkg_resources/tests/test_resources.py +++ b/pkg_resources/tests/test_resources.py @@ -14,6 +14,8 @@ from pkg_resources import (parse_requirements, VersionConflict, parse_version, packaging = pkg_resources.packaging +import six + def safe_repr(obj, short=False): """ copied from Python2.7""" try: @@ -313,7 +315,7 @@ class TestEntryPoints: def checkSubMap(self, m): assert len(m) == len(self.submap_expect) - for key, ep in pkg_resources.iteritems(self.submap_expect): + for key, ep in six.iteritems(self.submap_expect): assert repr(m.get(key)) == repr(ep) submap_expect = dict( |