From a160b317021ebf74a1a1d1fe21ffd36402984335 Mon Sep 17 00:00:00 2001 From: gcetusic Date: Thu, 27 Jun 2013 13:47:00 +0200 Subject: [PATCH] partial fix for some tests, 2 tests still fail --- tests/unit/test_httpretty.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/unit/test_httpretty.py b/tests/unit/test_httpretty.py index 514be58..63ba565 100644 --- a/tests/unit/test_httpretty.py +++ b/tests/unit/test_httpretty.py @@ -25,12 +25,16 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. from __future__ import unicode_literals -from mock import MagicMock from sure import expect from httpretty import HTTPretty, HTTPrettyError from httpretty.core import URIInfo, BaseClass, Entry, FakeSockFile from httpretty.http import STATUSES +try: + from mock import MagicMock +except ImportError: + from unittest.mock import MagicMock + def test_httpretty_should_raise_proper_exception_on_inconsistent_length(): "HTTPretty should raise proper exception on inconsistent Content-Length / "\