From 6fd63667aa7da4c794b4fb880d5c2949efe0073f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Socha?=
 <31014760+lukaszsocha2@users.noreply.github.com>
Date: Tue, 15 Feb 2022 11:20:22 +0100
Subject: [PATCH] feat: Replace external package `mock` with Python standard
 library `unittest.mock` (#697)

Closes: SDK-2005
---
 setup.py                                                 | 1 -
 test/conftest.py                                         | 9 ++++-----
 test/functional/conftest.py                              | 2 +-
 test/functional/test_delete.py                           | 2 +-
 test/functional/test_file_upload_update_download.py      | 2 +-
 test/functional/test_rate_limits.py                      | 2 +-
 test/integration/conftest.py                             | 2 +-
 test/integration/mock_network.py                         | 2 +-
 test/integration/test_as_user.py                         | 2 +-
 test/integration/test_retry_and_refresh.py               | 2 +-
 test/integration/test_with_shared_link.py                | 2 +-
 test/unit/auth/test_cooperatively_managed_oauth2.py      | 2 +-
 test/unit/auth/test_developer_token_auth.py              | 2 +-
 test/unit/auth/test_jwt_auth.py                          | 9 ++++-----
 test/unit/auth/test_oauth2.py                            | 2 +-
 test/unit/auth/test_redis_managed_oauth2.py              | 3 +--
 test/unit/auth/test_remote_managed_oauth2.py             | 2 +-
 test/unit/client/test_client.py                          | 2 +-
 test/unit/conftest.py                                    | 2 +-
 test/unit/network/conftest.py                            | 2 +-
 test/unit/network/test_network.py                        | 2 +-
 test/unit/object/conftest.py                             | 2 +-
 test/unit/object/test_base_api_json_object.py            | 2 +-
 test/unit/object/test_chunked_upload.py                  | 3 +--
 test/unit/object/test_device_pin.py                      | 2 +-
 test/unit/object/test_events.py                          | 2 +-
 test/unit/object/test_file.py                            | 2 +-
 test/unit/object/test_folder.py                          | 2 +-
 test/unit/object/test_group.py                           | 2 +-
 test/unit/object/test_legal_hold_assignment.py           | 3 +--
 test/unit/object/test_legal_hold_policy.py               | 2 +-
 test/unit/object/test_search.py                          | 3 +--
 test/unit/object/test_storage_policy_assignment.py       | 2 +-
 test/unit/object/test_task.py                            | 2 +-
 test/unit/object/test_task_assignment.py                 | 2 +-
 test/unit/object/test_upload_session.py                  | 3 +--
 test/unit/object/test_user.py                            | 3 +--
 test/unit/object/test_webhook.py                         | 2 +-
 .../test_limit_offset_based_object_collection.py         | 2 +-
 .../pagination/test_marker_based_object_collection.py    | 3 ++-
 test/unit/pagination/test_page.py                        | 3 ++-
 test/unit/session/test_session.py                        | 4 ++--
 test/unit/test_exception.py                              | 2 +-
 test/unit/util/test_api_call_decorator.py                | 2 +-
 test/unit/util/test_log.py                               | 2 +-
 test/util/streamable_mock_open.py                        | 2 +-
 46 files changed, 54 insertions(+), 61 deletions(-)

diff --git a/setup.py b/setup.py
index 53ddeca8..fa4b8c78 100644
--- a/setup.py
+++ b/setup.py
@@ -65,7 +65,6 @@ def main():
     test_requires = [
         'bottle',
         'jsonpatch>1.14',
-        'mock>=2.0.0, <4.0.0',
         'pycodestyle',
         'pylint',
         'sphinx',
diff --git a/test/conftest.py b/test/conftest.py
index 7cdb2b40..1c3c3a60 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -3,10 +3,9 @@
 import json
 import logging
 import sys
+from unittest.mock import Mock
 
-from mock import Mock
 import pytest
-import requests
 
 from boxsdk.network.default_network import DefaultNetworkResponse
 
@@ -36,7 +35,7 @@ def _set_content_and_json_from_content(mock_response, content):
 
 @pytest.fixture()
 def generic_successful_request_response():
-    mock_request_response = Mock(requests.Response(), headers={f'header{i}': f'value{i}' for i in range(4)})
+    mock_request_response = Mock(headers={f'header{i}': f'value{i}' for i in range(4)})
     _set_content_and_json_from_json(mock_request_response, json_value={f'key{i}': f'value{i}' for i in range(8)})
     mock_request_response.status_code = 200
     mock_request_response.ok = True
@@ -75,7 +74,7 @@ def successful_token_json_response(access_token, refresh_token):
 @pytest.fixture()
 def successful_token_request_response(successful_token_json_response):
     # pylint:disable=redefined-outer-name
-    successful_token_mock = Mock(requests.Response(), headers={})
+    successful_token_mock = Mock(headers={})
     _set_content_and_json_from_json(successful_token_mock, json_value=successful_token_json_response)
     successful_token_mock.ok = True
     successful_token_mock.status_code = 200
@@ -139,7 +138,7 @@ def retry_after_response(retry_after_response_202, retry_after_response_429, req
 
 
 def _server_error_request_response(status_code):
-    mock_request_response = Mock(requests.Response(), headers={f'header{i}': f'value{i}' for i in range(4)})
+    mock_request_response = Mock(headers={f'header{i}': f'value{i}' for i in range(4)})
     _set_content_and_json_from_json(mock_request_response, json_value={f'key{i}': f'value{i}' for i in range(8)})
     mock_request_response.status_code = status_code
     mock_request_response.ok = False
diff --git a/test/functional/conftest.py b/test/functional/conftest.py
index 7e4f09e9..43797927 100644
--- a/test/functional/conftest.py
+++ b/test/functional/conftest.py
@@ -2,12 +2,12 @@
 from urllib import parse
 from test.functional.mock_box.box import Box
 from test.util.streamable_mock_open import streamable_mock_open
+from unittest.mock import patch
 
 import re
 import pytest
 import requests
 
-from mock import patch
 from boxsdk.auth.oauth2 import OAuth2
 from boxsdk.client import LoggingClient
 from boxsdk.config import API
diff --git a/test/functional/test_delete.py b/test/functional/test_delete.py
index 78ddca9f..90d2c1cc 100644
--- a/test/functional/test_delete.py
+++ b/test/functional/test_delete.py
@@ -1,6 +1,6 @@
 # coding: utf-8
 from test.util.streamable_mock_open import streamable_mock_open
-from mock import patch
+from unittest.mock import patch
 
 import pytest
 
diff --git a/test/functional/test_file_upload_update_download.py b/test/functional/test_file_upload_update_download.py
index bcd8b248..f5e1f29d 100644
--- a/test/functional/test_file_upload_update_download.py
+++ b/test/functional/test_file_upload_update_download.py
@@ -2,7 +2,7 @@
 from test.util.streamable_mock_open import streamable_mock_open
 
 from io import BytesIO
-from mock import patch
+from unittest.mock import patch
 
 
 def test_upload_then_update(box_client, test_file_path, test_file_content, update_file_content, file_name):
diff --git a/test/functional/test_rate_limits.py b/test/functional/test_rate_limits.py
index 79f87a55..52a89fe5 100644
--- a/test/functional/test_rate_limits.py
+++ b/test/functional/test_rate_limits.py
@@ -1,6 +1,6 @@
 # coding: utf-8
 
-from mock import patch
+from unittest.mock import patch
 
 
 def test_too_many_requests_causes_retry(box_client, mock_box, monkeypatch):
diff --git a/test/integration/conftest.py b/test/integration/conftest.py
index cc606450..11a34637 100644
--- a/test/integration/conftest.py
+++ b/test/integration/conftest.py
@@ -1,6 +1,6 @@
 # coding: utf-8
 
-from mock import Mock
+from unittest.mock import Mock
 import pytest
 
 from boxsdk import Client
diff --git a/test/integration/mock_network.py b/test/integration/mock_network.py
index 4040d9c5..a50993fa 100644
--- a/test/integration/mock_network.py
+++ b/test/integration/mock_network.py
@@ -1,6 +1,6 @@
 # coding: utf-8
 
-from mock import Mock
+from unittest.mock import Mock
 import requests
 from boxsdk.network.default_network import DefaultNetworkResponse
 from boxsdk.network.network_interface import Network
diff --git a/test/integration/test_as_user.py b/test/integration/test_as_user.py
index 9c866a10..51d98c0f 100644
--- a/test/integration/test_as_user.py
+++ b/test/integration/test_as_user.py
@@ -1,6 +1,6 @@
 # coding: utf-8
 
-from mock import call
+from unittest.mock import call
 import pytest
 from boxsdk.config import API, Client
 from boxsdk.object.user import User
diff --git a/test/integration/test_retry_and_refresh.py b/test/integration/test_retry_and_refresh.py
index 9602b938..83eadfcf 100644
--- a/test/integration/test_retry_and_refresh.py
+++ b/test/integration/test_retry_and_refresh.py
@@ -1,6 +1,6 @@
 # coding: utf-8
 
-from mock import ANY, call
+from unittest.mock import ANY, call
 from boxsdk.config import API
 
 
diff --git a/test/integration/test_with_shared_link.py b/test/integration/test_with_shared_link.py
index 713566bc..0aaea6d4 100644
--- a/test/integration/test_with_shared_link.py
+++ b/test/integration/test_with_shared_link.py
@@ -1,6 +1,6 @@
 # coding: utf-8
 
-from mock import call
+from unittest.mock import call
 import pytest
 from boxsdk.config import API, Client
 from boxsdk.util.shared_link import get_shared_link_header
diff --git a/test/unit/auth/test_cooperatively_managed_oauth2.py b/test/unit/auth/test_cooperatively_managed_oauth2.py
index 3f8bfb23..e6be2fb2 100644
--- a/test/unit/auth/test_cooperatively_managed_oauth2.py
+++ b/test/unit/auth/test_cooperatively_managed_oauth2.py
@@ -1,6 +1,6 @@
 # coding: utf-8
 
-from mock import Mock
+from unittest.mock import Mock
 
 from boxsdk.auth import cooperatively_managed_oauth2
 
diff --git a/test/unit/auth/test_developer_token_auth.py b/test/unit/auth/test_developer_token_auth.py
index 6003aff4..b5285f17 100644
--- a/test/unit/auth/test_developer_token_auth.py
+++ b/test/unit/auth/test_developer_token_auth.py
@@ -1,6 +1,6 @@
 # coding: utf-8
 
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 from boxsdk.auth import developer_token_auth
 
 
diff --git a/test/unit/auth/test_jwt_auth.py b/test/unit/auth/test_jwt_auth.py
index db68bfb9..2513f42c 100644
--- a/test/unit/auth/test_jwt_auth.py
+++ b/test/unit/auth/test_jwt_auth.py
@@ -7,14 +7,13 @@
 import json
 import random
 import string
+from unittest.mock import Mock, mock_open, patch, sentinel, call
 
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKey, generate_private_key as generate_rsa_private_key
 from cryptography.hazmat.primitives import serialization
-from mock import Mock, mock_open, patch, sentinel, call
 import pytest
 import pytz
-import requests
 
 from boxsdk.auth.jwt_auth import JWTAuth
 from boxsdk.exception import BoxOAuthException
@@ -85,7 +84,7 @@ def test_jwt_auth_init_raises_type_error_unless_exactly_one_of_rsa_private_key_f
         JWTAuth(**kwargs)
 
 
-@pytest.mark.parametrize('key_data', [object(), u'ƒøø'])
+@pytest.mark.parametrize('key_data', [object(), 'ƒøø'])
 @pytest.mark.parametrize('rsa_passphrase', [None])
 def test_jwt_auth_init_raises_type_error_if_rsa_private_key_data_has_unexpected_type(key_data, rsa_private_key_bytes):
     kwargs = dict(
@@ -258,7 +257,7 @@ def test_authenticate_instance_saves_enterprise_id_for_future_calls(jwt_auth_ini
             auth.authenticate_instance('fake_enterprise_id_2')
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def jwt_encode():
     with patch('jwt.encode') as patched_jwt_encode:
         yield patched_jwt_encode
@@ -478,7 +477,7 @@ def box_datetime():
 @pytest.fixture
 def unsuccessful_jwt_response(box_datetime, status_code, error_description, include_date_header, error_code):
     headers = {'Date': box_datetime.strftime('%a, %d %b %Y %H:%M:%S %Z')} if include_date_header else {}
-    unsuccessful_response = Mock(requests.Response(), headers=headers)
+    unsuccessful_response = Mock(headers=headers)
     unsuccessful_response.json.return_value = {'error_description': error_description, 'error': error_code}
     unsuccessful_response.status_code = status_code
     unsuccessful_response.ok = False
diff --git a/test/unit/auth/test_oauth2.py b/test/unit/auth/test_oauth2.py
index fd1c3ea3..66cf24a7 100644
--- a/test/unit/auth/test_oauth2.py
+++ b/test/unit/auth/test_oauth2.py
@@ -3,10 +3,10 @@
 from functools import partial
 import re
 from threading import Thread
+from unittest.mock import Mock, patch
 import uuid
 from urllib import parse
 
-from mock import Mock, patch
 import pytest
 
 from boxsdk.exception import BoxOAuthException
diff --git a/test/unit/auth/test_redis_managed_oauth2.py b/test/unit/auth/test_redis_managed_oauth2.py
index 49f1dcd0..96a3594d 100644
--- a/test/unit/auth/test_redis_managed_oauth2.py
+++ b/test/unit/auth/test_redis_managed_oauth2.py
@@ -1,9 +1,8 @@
 # coding: utf-8
 
+from unittest.mock import Mock, patch
 import uuid
 
-from mock import Mock, patch
-
 from boxsdk.auth import redis_managed_oauth2
 
 
diff --git a/test/unit/auth/test_remote_managed_oauth2.py b/test/unit/auth/test_remote_managed_oauth2.py
index 8f0269bd..f044aeb3 100644
--- a/test/unit/auth/test_remote_managed_oauth2.py
+++ b/test/unit/auth/test_remote_managed_oauth2.py
@@ -1,6 +1,6 @@
 # coding: utf-8
 
-from mock import Mock
+from unittest.mock import Mock
 
 from boxsdk.auth import remote_managed_oauth2
 
diff --git a/test/unit/client/test_client.py b/test/unit/client/test_client.py
index ee651052..f75cbe08 100644
--- a/test/unit/client/test_client.py
+++ b/test/unit/client/test_client.py
@@ -3,8 +3,8 @@
 
 import json
 from io import BytesIO
+from unittest.mock import Mock, ANY
 
-from mock import Mock, ANY
 import pytest
 
 
diff --git a/test/unit/conftest.py b/test/unit/conftest.py
index 8c9a0d97..f27dddbd 100644
--- a/test/unit/conftest.py
+++ b/test/unit/conftest.py
@@ -3,7 +3,7 @@
 import copy
 import json
 
-from mock import Mock, MagicMock
+from unittest.mock import Mock, MagicMock
 import pytest
 
 from boxsdk.config import API, Client, Proxy
diff --git a/test/unit/network/conftest.py b/test/unit/network/conftest.py
index 59c9dccf..1f69c9b2 100644
--- a/test/unit/network/conftest.py
+++ b/test/unit/network/conftest.py
@@ -1,6 +1,6 @@
 # coding: utf-8
 
-from mock import Mock
+from unittest.mock import Mock
 import pytest
 from requests import Session
 
diff --git a/test/unit/network/test_network.py b/test/unit/network/test_network.py
index 3b79af0e..003d9666 100644
--- a/test/unit/network/test_network.py
+++ b/test/unit/network/test_network.py
@@ -5,8 +5,8 @@
 from logging import Logger
 from operator import attrgetter
 from pprint import pformat
+from unittest.mock import DEFAULT, Mock, patch, ANY
 
-from mock import DEFAULT, Mock, patch, ANY
 import pytest
 from requests import Response
 
diff --git a/test/unit/object/conftest.py b/test/unit/object/conftest.py
index f08e964b..d4397202 100644
--- a/test/unit/object/conftest.py
+++ b/test/unit/object/conftest.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 
 import os
-from mock import Mock
+from unittest.mock import Mock
 import pytest
 from boxsdk.object.collaboration import Collaboration
 from boxsdk.object.collection import Collection
diff --git a/test/unit/object/test_base_api_json_object.py b/test/unit/object/test_base_api_json_object.py
index 6ad8f743..22e25766 100644
--- a/test/unit/object/test_base_api_json_object.py
+++ b/test/unit/object/test_base_api_json_object.py
@@ -40,7 +40,7 @@ def test_iter(base_api_json_object):
 
 
 def test_meta_registers_new_item_type_in_default_translator(default_translator, original_default_translator):
-    item_type = u'ƒøø'
+    item_type = 'ƒøø'
 
     class Foo(BaseAPIJSONObject):
         _item_type = item_type
diff --git a/test/unit/object/test_chunked_upload.py b/test/unit/object/test_chunked_upload.py
index eb0ab05c..5f988df4 100644
--- a/test/unit/object/test_chunked_upload.py
+++ b/test/unit/object/test_chunked_upload.py
@@ -1,11 +1,10 @@
 # coding: utf-8
 # pylint: disable-msg=too-many-locals
-
+from unittest.mock import MagicMock, Mock, call
 import io
 import json
 import pytest
 
-from mock import MagicMock, Mock, call
 from boxsdk.config import API
 from boxsdk.exception import BoxAPIException
 from boxsdk.exception import BoxException
diff --git a/test/unit/object/test_device_pin.py b/test/unit/object/test_device_pin.py
index d1a09176..9902ed5b 100644
--- a/test/unit/object/test_device_pin.py
+++ b/test/unit/object/test_device_pin.py
@@ -1,8 +1,8 @@
 # coding: utf-8
 
+from unittest.mock import Mock
 import pytest
 
-from mock import Mock
 from boxsdk.config import API
 from boxsdk.object.device_pinner import DevicePinner
 from boxsdk.network.default_network import DefaultNetworkResponse
diff --git a/test/unit/object/test_events.py b/test/unit/object/test_events.py
index 6e59b7e7..b2278c69 100644
--- a/test/unit/object/test_events.py
+++ b/test/unit/object/test_events.py
@@ -4,9 +4,9 @@
 from itertools import chain
 import json
 from typing import Optional, Union
+from unittest.mock import Mock
 from urllib.parse import urlunsplit, urlencode
 
-from mock import Mock
 import pytest
 from requests.exceptions import Timeout
 
diff --git a/test/unit/object/test_file.py b/test/unit/object/test_file.py
index cf7e07de..62f4260f 100644
--- a/test/unit/object/test_file.py
+++ b/test/unit/object/test_file.py
@@ -2,8 +2,8 @@
 
 import json
 from io import BytesIO
+from unittest.mock import mock_open, patch, Mock
 
-from mock import mock_open, patch, Mock
 import pytest
 from boxsdk.config import API
 from boxsdk.exception import BoxAPIException
diff --git a/test/unit/object/test_folder.py b/test/unit/object/test_folder.py
index c1bbf2e1..71551a09 100644
--- a/test/unit/object/test_folder.py
+++ b/test/unit/object/test_folder.py
@@ -3,7 +3,7 @@
 import json
 from io import BytesIO
 from os.path import basename
-from mock import mock_open, patch, Mock, MagicMock
+from unittest.mock import mock_open, patch, Mock, MagicMock
 import pytest
 from boxsdk.config import API
 from boxsdk.exception import BoxAPIException
diff --git a/test/unit/object/test_group.py b/test/unit/object/test_group.py
index 88e0ed20..86d17fa2 100644
--- a/test/unit/object/test_group.py
+++ b/test/unit/object/test_group.py
@@ -3,8 +3,8 @@
 from itertools import chain, islice, repeat, count
 import json
 from operator import sub
+from unittest.mock import Mock
 
-from mock import Mock
 import pytest
 
 from boxsdk.network.default_network import DefaultNetworkResponse
diff --git a/test/unit/object/test_legal_hold_assignment.py b/test/unit/object/test_legal_hold_assignment.py
index 72880543..a3d746e4 100644
--- a/test/unit/object/test_legal_hold_assignment.py
+++ b/test/unit/object/test_legal_hold_assignment.py
@@ -1,8 +1,7 @@
 # coding: utf-8
-
+from unittest.mock import Mock
 import pytest
 
-from mock import Mock
 from boxsdk.object.legal_hold_policy_assignment import LegalHoldPolicyAssignment
 from boxsdk.config import API
 from boxsdk.network.default_network import DefaultNetworkResponse
diff --git a/test/unit/object/test_legal_hold_policy.py b/test/unit/object/test_legal_hold_policy.py
index eaaab6bf..f4b99363 100644
--- a/test/unit/object/test_legal_hold_policy.py
+++ b/test/unit/object/test_legal_hold_policy.py
@@ -1,8 +1,8 @@
 # coding: utf-8
+from unittest.mock import Mock
 import json
 import pytest
 
-from mock import Mock
 from boxsdk.object.legal_hold_policy import LegalHoldPolicy
 from boxsdk.object.legal_hold_policy_assignment import LegalHoldPolicyAssignment
 from boxsdk.config import API
diff --git a/test/unit/object/test_search.py b/test/unit/object/test_search.py
index 72a70051..7a12ecfa 100644
--- a/test/unit/object/test_search.py
+++ b/test/unit/object/test_search.py
@@ -1,9 +1,8 @@
 # coding: utf-8
-
+from unittest.mock import ANY
 import json
 import pytest
 
-from mock import ANY
 from boxsdk.config import API
 from boxsdk.object.file import File
 from boxsdk.object.user import User
diff --git a/test/unit/object/test_storage_policy_assignment.py b/test/unit/object/test_storage_policy_assignment.py
index d69b59c2..de3af7c1 100644
--- a/test/unit/object/test_storage_policy_assignment.py
+++ b/test/unit/object/test_storage_policy_assignment.py
@@ -1,8 +1,8 @@
 # coding: utf-8
+from unittest.mock import Mock
 import json
 import pytest
 
-from mock import Mock
 from boxsdk.config import API
 from boxsdk.object.storage_policy_assignment import StoragePolicyAssignment
 from boxsdk.network.default_network import DefaultNetworkResponse
diff --git a/test/unit/object/test_task.py b/test/unit/object/test_task.py
index 4eb3a850..6e5da14e 100644
--- a/test/unit/object/test_task.py
+++ b/test/unit/object/test_task.py
@@ -1,7 +1,7 @@
+from unittest.mock import Mock
 import json
 import pytest
 
-from mock import Mock
 from boxsdk.config import API
 from boxsdk.object.task import Task
 from boxsdk.object.task_assignment import TaskAssignment
diff --git a/test/unit/object/test_task_assignment.py b/test/unit/object/test_task_assignment.py
index 59fa3934..9473734c 100644
--- a/test/unit/object/test_task_assignment.py
+++ b/test/unit/object/test_task_assignment.py
@@ -1,7 +1,7 @@
+from unittest.mock import Mock
 import json
 import pytest
 
-from mock import Mock
 from boxsdk.config import API
 from boxsdk.object.task_assignment import TaskAssignment, ResolutionState
 from boxsdk.network.default_network import DefaultNetworkResponse
diff --git a/test/unit/object/test_upload_session.py b/test/unit/object/test_upload_session.py
index 0f9d9229..30a06722 100644
--- a/test/unit/object/test_upload_session.py
+++ b/test/unit/object/test_upload_session.py
@@ -1,12 +1,11 @@
 # coding: utf-8
-
+from unittest.mock import patch
 import base64
 import hashlib
 import io
 import json
 import pytest
 
-from mock import patch
 from boxsdk.config import API
 from boxsdk.util.chunked_uploader import ChunkedUploader
 from boxsdk.object.file import File
diff --git a/test/unit/object/test_user.py b/test/unit/object/test_user.py
index 93dd2dab..f2a9ca09 100644
--- a/test/unit/object/test_user.py
+++ b/test/unit/object/test_user.py
@@ -1,9 +1,8 @@
 # coding: utf-8
-
+from unittest.mock import Mock
 import json
 import pytest
 
-from mock import Mock
 from boxsdk.config import API
 from boxsdk.object.email_alias import EmailAlias
 from boxsdk.object.folder import Folder
diff --git a/test/unit/object/test_webhook.py b/test/unit/object/test_webhook.py
index a46df90a..dd408948 100644
--- a/test/unit/object/test_webhook.py
+++ b/test/unit/object/test_webhook.py
@@ -1,8 +1,8 @@
 # coding: utf-8
+from unittest.mock import Mock
 import json
 import pytest
 
-from mock import Mock
 from boxsdk.config import API
 from boxsdk.network.default_network import DefaultNetworkResponse
 from boxsdk.object.webhook import Webhook
diff --git a/test/unit/pagination/test_limit_offset_based_object_collection.py b/test/unit/pagination/test_limit_offset_based_object_collection.py
index 7e37674f..ecfc7fd7 100644
--- a/test/unit/pagination/test_limit_offset_based_object_collection.py
+++ b/test/unit/pagination/test_limit_offset_based_object_collection.py
@@ -1,8 +1,8 @@
 # coding: utf-8
 
 import json
+from unittest.mock import Mock, PropertyMock
 
-from mock import Mock, PropertyMock
 import pytest
 
 from boxsdk.network.default_network import DefaultNetworkResponse
diff --git a/test/unit/pagination/test_marker_based_object_collection.py b/test/unit/pagination/test_marker_based_object_collection.py
index af9c9938..5a38b718 100644
--- a/test/unit/pagination/test_marker_based_object_collection.py
+++ b/test/unit/pagination/test_marker_based_object_collection.py
@@ -1,7 +1,8 @@
 # coding: utf-8
 
 import json
-from mock import Mock, PropertyMock, ANY
+from unittest.mock import Mock, PropertyMock, ANY
+
 import pytest
 
 from boxsdk.network.default_network import DefaultNetworkResponse
diff --git a/test/unit/pagination/test_page.py b/test/unit/pagination/test_page.py
index d02a7fae..c0965991 100644
--- a/test/unit/pagination/test_page.py
+++ b/test/unit/pagination/test_page.py
@@ -1,6 +1,7 @@
 # coding: utf-8
 
-from mock import Mock, PropertyMock
+from unittest.mock import Mock, PropertyMock
+
 import pytest
 
 from boxsdk.object.file import File
diff --git a/test/unit/session/test_session.py b/test/unit/session/test_session.py
index f29bd888..9b047dfd 100644
--- a/test/unit/session/test_session.py
+++ b/test/unit/session/test_session.py
@@ -3,8 +3,8 @@
 from functools import partial
 from io import IOBase
 from numbers import Number
+from unittest.mock import MagicMock, Mock, PropertyMock, call, patch, ANY
 
-from mock import MagicMock, Mock, PropertyMock, call, patch, ANY
 import pytest
 
 from boxsdk.auth.oauth2 import OAuth2
@@ -262,7 +262,7 @@ def test_translator(box_session, translator, default_translator, original_defaul
     class Foo:
         pass
 
-    item_type = u'ƒøø'
+    item_type = 'ƒøø'
     box_session.translator.register(item_type, Foo)
     assert box_session.translator.get(item_type) is Foo
 
diff --git a/test/unit/test_exception.py b/test/unit/test_exception.py
index 66871e29..b2ba4f55 100644
--- a/test/unit/test_exception.py
+++ b/test/unit/test_exception.py
@@ -1,6 +1,6 @@
 # coding: utf-8
 
-from mock import Mock
+from unittest.mock import Mock
 import pytest
 
 from boxsdk.exception import BoxAPIException, BoxOAuthException
diff --git a/test/unit/util/test_api_call_decorator.py b/test/unit/util/test_api_call_decorator.py
index 192bf042..cb358ec1 100644
--- a/test/unit/util/test_api_call_decorator.py
+++ b/test/unit/util/test_api_call_decorator.py
@@ -1,6 +1,6 @@
 # coding: utf-8
 
-from mock import NonCallableMock
+from unittest.mock import NonCallableMock
 import pytest
 
 from boxsdk.object.cloneable import Cloneable
diff --git a/test/unit/util/test_log.py b/test/unit/util/test_log.py
index 4c1937ae..9b1fa253 100644
--- a/test/unit/util/test_log.py
+++ b/test/unit/util/test_log.py
@@ -2,8 +2,8 @@
 
 import io
 import logging
+from unittest.mock import mock_open, patch, Mock
 
-from mock import mock_open, patch, Mock
 import pytest
 
 import boxsdk.util.log
diff --git a/test/util/streamable_mock_open.py b/test/util/streamable_mock_open.py
index ab6ff05d..d97b4b36 100644
--- a/test/util/streamable_mock_open.py
+++ b/test/util/streamable_mock_open.py
@@ -1,6 +1,6 @@
 # coding: utf-8
 
-from mock import mock_open
+from unittest.mock import mock_open
 
 
 def streamable_mock_open(mock=None, read_data=b''):