Merge pull request #396 from mgorny/unittest-mock

Use unittest.mock over mock when available

6 files changed, 21 insertions, 10 deletions

diff --git a/development.txt b/development.txt
index a45f6ce..3b86728 100644
--- a/development.txt
+++ b/development.txt
@@ -5,7 +5,7 @@ freezegun
 httplib2
 ipdb
 mccabe
-mock
+mock;python_version<"3.3"
 ndg-httpsclient
 nose-randomly
 nose
diff --git a/setup.py b/setup.py
index a43e178..758d6e4 100644
--- a/setup.py
+++ b/setup.py
@@ -41,7 +41,8 @@ local_file = lambda *f: \
 
 
 install_requires = []
-tests_requires = ['nose', 'sure', 'coverage', 'mock', 'rednose']
+tests_requires = ['nose', 'sure', 'coverage', 'mock;python_version<"3.3"',
+                  'rednose']
 
 
 setup(
diff --git a/tests/functional/test_requests.py b/tests/functional/test_requests.py
index 7d14c8f..14dceac 100644
--- a/tests/functional/test_requests.py
+++ b/tests/functional/test_requests.py
@@ -33,7 +33,6 @@ import json
 import requests
 import signal
 from freezegun import freeze_time
-from mock import Mock
 from unittest import skip
 from contextlib import contextmanager
 from sure import within, microseconds, expect
@@ -41,9 +40,13 @@ from tornado import version as tornado_version
 from httpretty import HTTPretty, httprettified
 from httpretty.core import decode_utf8
 
-
 from tests.functional.base import FIXTURE_FILE, use_tornado_server
 
+try:
+    from unittest.mock import Mock
+except ImportError:
+    from mock import Mock
+
 
 try:
     advance_iterator = next
diff --git a/tests/unit/test_core.py b/tests/unit/test_core.py
index def9ff7..1ef0867 100644
--- a/tests/unit/test_core.py
+++ b/tests/unit/test_core.py
@@ -3,12 +3,16 @@ import json
 import errno
 
 from freezegun import freeze_time
-from mock import Mock, patch, call
 from sure import expect
 
 from httpretty.core import HTTPrettyRequest, FakeSSLSocket, fakesock, httpretty
 from httpretty.core import URIMatcher, URIInfo
 
+try:
+    from unittest.mock import Mock, patch, call
+except ImportError:
+    from mock import Mock, patch, call
+
 
 class SocketErrorStub(Exception):
     def __init__(self, errno):
diff --git a/tests/unit/test_httpretty.py b/tests/unit/test_httpretty.py
index 08379a8..d75a157 100644
--- a/tests/unit/test_httpretty.py
+++ b/tests/unit/test_httpretty.py
@@ -36,11 +36,10 @@ from httpretty.core import URIInfo, BaseClass, Entry, FakeSockFile, HTTPrettyReq
 from httpretty.http import STATUSES
 
 try:
-    from mock import MagicMock
-    from mock import patch
+    from unittest.mock import MagicMock, patch
 except ImportError:
-    from unittest.mock import MagicMock
-    from unittest.mock import patch
+    from mock import MagicMock, patch
+
 
 TEST_HEADER = """
 GET /test/test.html HTTP/1.1
diff --git a/tests/unit/test_main.py b/tests/unit/test_main.py
index 1c7bc0e..35a7b7d 100644
--- a/tests/unit/test_main.py
+++ b/tests/unit/test_main.py
@@ -1,10 +1,14 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
-from mock import patch
 import httpretty
 from httpretty.core import HTTPrettyRequest
 
+try:
+    from unittest.mock import patch
+except ImportError:
+    from mock import patch
+
 
 @patch('httpretty.httpretty')
 def test_last_request(original):