summaryrefslogtreecommitdiff
path: root/pkg_resources/tests/test_markers.py
diff options
context:
space:
mode:
authorSteve Kowalik <steven@wedontsleep.org>2016-01-07 14:04:36 +1100
committerSteve Kowalik <steven@wedontsleep.org>2016-01-07 14:04:36 +1100
commit3bd5118eaa87b4f6598e0a473fec3623b6579d3b (patch)
tree22b9a1f65394dfee78f4327db2ee02cda2a14f55 /pkg_resources/tests/test_markers.py
parent7d63ebffa598f12b55d9fd0a41768ec88ff70528 (diff)
downloadpython-setuptools-git-3bd5118eaa87b4f6598e0a473fec3623b6579d3b.tar.gz
Destroy MarkerEvaluation for being pointless, fix two silly mistakes in tests and update packaging changes.
Diffstat (limited to 'pkg_resources/tests/test_markers.py')
-rw-r--r--pkg_resources/tests/test_markers.py12
1 files changed, 5 insertions, 7 deletions
diff --git a/pkg_resources/tests/test_markers.py b/pkg_resources/tests/test_markers.py
index 2f4b52c5..0af3089e 100644
--- a/pkg_resources/tests/test_markers.py
+++ b/pkg_resources/tests/test_markers.py
@@ -1,12 +1,10 @@
try:
- import unittest.mock as mock
+ import unitest.mock as mock
except ImportError:
- import mock
+ import mock
from pkg_resources import evaluate_marker
-
-@mock.patch.dict('pkg_resources.MarkerEvaluation.values',
- python_full_version=mock.Mock(return_value='2.7.10'))
-def test_ordering():
- assert evaluate_marker("python_full_version > '2.7.3'") is True
+@mock.patch('platform.python_version', return_value='2.7.10')
+def test_ordering(python_version_mock):
+ assert evaluate_marker("python_full_version > '2.7.3'") is True