diff options
| author | Steve Kowalik <steven@wedontsleep.org> | 2016-02-19 14:20:30 +1100 |
|---|---|---|
| committer | Steve Kowalik <steven@wedontsleep.org> | 2016-02-19 14:20:30 +1100 |
| commit | 335aba6f265f694612e610c6acceb34c182a94c5 (patch) | |
| tree | fdd6db455579d280905a0a103a6cbaa863ff9668 | |
| parent | 69175b941a74a4e2f37b856437b3ca20bc2f240a (diff) | |
| download | external_python_setuptools-335aba6f265f694612e610c6acceb34c182a94c5.tar.gz external_python_setuptools-335aba6f265f694612e610c6acceb34c182a94c5.tar.bz2 external_python_setuptools-335aba6f265f694612e610c6acceb34c182a94c5.zip | |
Correct tests under both Python 2 and 3.
| -rw-r--r-- | pkg_resources/__init__.py | 4 | ||||
| -rw-r--r-- | pkg_resources/tests/test_resources.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py index 118cb63b..5b68da15 100644 --- a/pkg_resources/__init__.py +++ b/pkg_resources/__init__.py @@ -75,8 +75,8 @@ except ImportError: from pkg_resources.extern import packaging __import__('pkg_resources.extern.packaging.version') __import__('pkg_resources.extern.packaging.specifiers') -__import__('pkg_resources._vendor.packaging.requirements') -__import__('pkg_resources._vendor.packaging.markers') +__import__('pkg_resources.extern.packaging.requirements') +__import__('pkg_resources.extern.packaging.markers') if (3, 0) < sys.version_info < (3, 3): diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py index 909b29d3..7b98ae0d 100644 --- a/pkg_resources/tests/test_resources.py +++ b/pkg_resources/tests/test_resources.py @@ -384,8 +384,8 @@ class TestRequirements: r1 = Requirement.parse("Twisted[foo,bar]>=1.2") r2 = Requirement.parse("Twisted[bar,FOO]>=1.2") assert r1 == r2 - assert r1.extras == ("foo","bar") - assert r2.extras == ("foo","bar") + assert set(r1.extras) == set(("foo", "bar")) + assert set(r2.extras) == set(("foo", "bar")) assert hash(r1) == hash(r2) assert ( hash(r1) |