From 3bd5118eaa87b4f6598e0a473fec3623b6579d3b Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Thu, 7 Jan 2016 14:04:36 +1100 Subject: Destroy MarkerEvaluation for being pointless, fix two silly mistakes in tests and update packaging changes. --- pkg_resources/tests/test_markers.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'pkg_resources/tests') 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 -- cgit v1.2.1