Use standard library mock when possible

docs/source/testing.rst

@@ -30,7 +30,7 @@ First of all, in order to make sure your code doesn't do any network requests, y
 
 .. code-block:: python
 
-    import mock
+    from unittest import mock
     import pytest
 
     from bravado.client import SwaggerClient
@@ -46,7 +46,7 @@ Now we can mock out that call to ``findPetsByStatus`` by using the
 
 .. code-block:: python
 
-    import mock
+    from unittest import mock
 
     from bravado.testing.response_mocks import BravadoResponseMock
 

requirements-dev.txt

@@ -1,7 +1,7 @@
 bottle
 ephemeral_port_reserve
 httpretty
-mock
+mock; python_version<'3.3'
 pip>=9.0.1 # workaround to https://github.com/pypa/pip/issues/3903
 pre-commit
 pytest<4.7  # need support for Python 2.7, see https://docs.pytest.org/en/latest/py27-py34-deprecation.html

tests/client/construct_params_test.py

@@ -2,7 +2,10 @@
 import pytest
 from bravado_core.exception import SwaggerMappingError
 from bravado_core.operation import Operation
-from mock import patch
+try:
+    from unittest.mock import patch
+except ImportError:
+    from mock import patch
 
 from bravado.client import CallableOperation
 from bravado.client import construct_params

tests/client/construct_request_test.py

@@ -2,7 +2,10 @@
 from typing import Any
 from typing import Dict
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import pytest
 from bravado_core.operation import Operation
 from bravado_core.request import IncomingRequest

tests/client/inject_headers_for_remote_refs_test.py

@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
 from bravado_core.operation import Operation
-from mock import Mock
+try:
+    from unittest.mock import Mock
+except ImportError:
+    from mock import Mock
 
 from bravado.client import inject_headers_for_remote_refs
 

tests/client_test.py

@@ -2,7 +2,10 @@
 import typing
 from copy import deepcopy
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import pytest
 
 from bravado.client import SwaggerClient

tests/config_test.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import pytest
 
 from bravado.config import _get_response_metadata_class

tests/fido_client/FidoClient/request_test.py

@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
-import mock
-from mock import patch
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 from bravado.fido_client import FidoClient
 
 
 def test_request_no_timeouts_passed_to_fido():
-    with patch('bravado.fido_client.fido.fetch') as fetch:
+    with mock.patch('bravado.fido_client.fido.fetch') as fetch:
         request_params = dict(url='http://foo.com/')
         FidoClient().request(request_params)
         assert fetch.call_args == mock.call(
@@ -18,7 +20,7 @@ def test_request_no_timeouts_passed_to_fido():
 
 
 def test_request_timeout_passed_to_fido():
-    with patch('bravado.fido_client.fido.fetch') as fetch:
+    with mock.patch('bravado.fido_client.fido.fetch') as fetch:
         request_params = dict(url='http://foo.com/', timeout=1)
         FidoClient().request(request_params)
         assert fetch.call_args == mock.call(
@@ -31,7 +33,7 @@ def test_request_timeout_passed_to_fido():
 
 
 def test_request_connect_timeout_passed_to_fido():
-    with patch('bravado.fido_client.fido.fetch') as fetch:
+    with mock.patch('bravado.fido_client.fido.fetch') as fetch:
         request_params = dict(url='http://foo.com/', connect_timeout=1)
         FidoClient().request(request_params)
         assert fetch.call_args == mock.call(
@@ -44,7 +46,7 @@ def test_request_connect_timeout_passed_to_fido():
 
 
 def test_request_connect_timeout_and_timeout_passed_to_fido():
-    with patch('bravado.fido_client.fido.fetch') as fetch:
+    with mock.patch('bravado.fido_client.fido.fetch') as fetch:
         request_params = dict(url='http://foo.com/', connect_timeout=1,
                               timeout=2)
         FidoClient().request(request_params)
@@ -59,7 +61,7 @@ def test_request_connect_timeout_and_timeout_passed_to_fido():
 
 
 def test_request_tcp_nodeley_passed_to_fido():
-    with patch('bravado.fido_client.fido.fetch') as fetch:
+    with mock.patch('bravado.fido_client.fido.fetch') as fetch:
         request_params = dict(url='http://foo.com/', tcp_nodelay=True)
         FidoClient().request(request_params)
         assert fetch.call_args == mock.call(

tests/fido_client/FidoFutureAdapter/result_test.py

@@ -2,7 +2,10 @@
 import crochet
 import fido.exceptions
 import pytest
-from mock import Mock
+try:
+    from unittest.mock import Mock
+except ImportError:
+    from mock import Mock
 
 from bravado.fido_client import FidoFutureAdapter
 

tests/fido_client/fido_response_adapter_test.py

@@ -1,7 +1,10 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 from bravado.fido_client import FidoResponseAdapter
 

tests/http_client_test.py

@@ -4,7 +4,10 @@
 import unittest
 
 import httpretty
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import pytest
 import requests
 from bravado_core.response import IncomingResponse

tests/http_future/HttpFuture/cancel_test.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import pytest
 from bravado_core.response import IncomingResponse
 

tests/http_future/HttpFuture/conftest.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import pytest
 
 from bravado.http_future import FutureAdapter

tests/http_future/HttpFuture/response_test.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import pytest
 from bravado_core.response import IncomingResponse
 

tests/http_future/HttpFuture/result_test.py

@@ -4,8 +4,10 @@
 import pytest
 from bravado_core.operation import Operation
 from bravado_core.response import IncomingResponse
-from mock import Mock
-from mock import patch
+try:
+    from unittest.mock import Mock, patch
+except ImportError:
+    from mock import Mock, patch
 
 from bravado.config import RequestConfig
 from bravado.exception import HTTPError

tests/http_future/raise_on_expected_test.py

@@ -1,7 +1,10 @@
 # -*- coding: utf-8 -*-
 import pytest
 from bravado_core.response import IncomingResponse
-from mock import Mock
+try:
+    from unittest.mock import Mock
+except ImportError:
+    from mock import Mock
 
 from bravado.exception import HTTPError
 from bravado.http_future import raise_on_expected

tests/http_future/raise_on_unexpected_test.py

@@ -1,7 +1,10 @@
 # -*- coding: utf-8 -*-
 import pytest
 from bravado_core.response import IncomingResponse
-from mock import Mock
+try:
+    from unittest.mock import Mock
+except ImportError:
+    from mock import Mock
 
 from bravado.exception import HTTPError
 from bravado.http_future import raise_on_unexpected

tests/http_future/unmarshall_response_inner_test.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import msgpack
 import pytest
 from bravado_core.content_type import APP_JSON

tests/http_future/unmarshall_response_test.py

@@ -3,8 +3,10 @@
 from bravado_core.exception import MatchingResponseNotFound
 from bravado_core.operation import Operation
 from bravado_core.response import IncomingResponse
-from mock import Mock
-from mock import patch
+try:
+    from unittest.mock import Mock, patch
+except ImportError:
+    from mock import Mock, patch
 
 from bravado.exception import HTTPError
 from bravado.http_future import unmarshal_response

tests/requests_client/RequestsFutureAdapter/conftest.py

@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
 import pytest
-from mock import Mock
+try:
+    from unittest.mock import Mock
+except ImportError:
+    from mock import Mock
 from requests.sessions import Session
 
 

tests/response_test.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 from bravado.config import RequestConfig
 from bravado.response import BravadoResponseMetadata

tests/testing/response_mocks_test.py

@@ -1,7 +1,11 @@
 # -*- coding: utf-8 -*-
 import inspect
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+
 import pytest
 from bravado_core.response import IncomingResponse
 

tests/warning/warn_for_deprecated_op_test.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
-from mock import Mock
-from mock import patch
+try:
+    from unittest.mock import Mock, patch
+except ImportError:
+    from mock import Mock, patch
 
 from bravado.client import CallableOperation
 from bravado.warning import warn_for_deprecated_op