Remove the dependency on the separate package mock.

noxfile.py

@@ -78,7 +78,7 @@ def default(session):
         CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt"
     )
     # Install all test dependencies, then install this package in-place.
-    session.install("mock", "pytest", "pytest-cov", "-c", constraints_path)
+    session.install("pytest", "pytest-cov", "-c", constraints_path)
     session.install("-e", ".", "-c", constraints_path)
 
     # Run py.test against the unit tests.
@@ -136,7 +136,7 @@ def system(session):
     # 2021-05-06: defer installing 'google-cloud-*' to after this package,
     #             in order to work around Python 2.7 googolapis-common-protos
     #             issue.
-    session.install("mock", "pytest", "-c", constraints_path)
+    session.install("pytest", "-c", constraints_path)
     session.install("-e", ".", "-c", constraints_path)
     session.install(
         "google-cloud-testutils",

samples/snippets/notification_polling_test.py

@@ -14,7 +14,7 @@
 
 
 from google.cloud.pubsub_v1.subscriber.message import Message
-import mock
+from unittest import mock
 
 from notification_polling import summarize
 

samples/snippets/quickstart_test.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 import quickstart
 

samples/snippets/requirements-test.txt

@@ -1,3 +1,2 @@
 pytest==7.1.1
-mock==4.0.3
 backoff==1.11.1

tests/system/test_blob.py

@@ -18,9 +18,9 @@
 import os
 import tempfile
 import warnings
+from unittest import mock
 
 import pytest
-import mock
 
 from google import resumable_media
 from google.api_core import exceptions

tests/unit/test__helpers.py

@@ -13,8 +13,7 @@
 # limitations under the License.
 
 import unittest
-
-import mock
+from unittest import mock
 
 from google.cloud.storage.retry import DEFAULT_RETRY
 from google.cloud.storage.retry import DEFAULT_RETRY_IF_METAGENERATION_SPECIFIED
@@ -556,8 +555,6 @@ def test_it(self):
         self.assertEqual(SIGNED_CONTENT, b"kBiQqOnIz21aGlQrIp/r/w==")
 
     def test_it_with_stubs(self):
-        import mock
-
         class _Buffer(object):
             def __init__(self, return_vals):
                 self.return_vals = return_vals

tests/unit/test__http.py

@@ -14,8 +14,7 @@
 
 import unittest
 from unittest.mock import patch
-
-import mock
+from unittest import mock
 
 from google.cloud.storage import _helpers
 from tests.unit.test__helpers import GCCL_INVOCATION_TEST_CONST

tests/unit/test__signing.py

@@ -22,8 +22,8 @@
 import time
 import unittest
 import urllib.parse
+from unittest import mock
 
-import mock
 import pytest
 
 from . import _read_local_json

tests/unit/test_acl.py

@@ -13,8 +13,7 @@
 # limitations under the License.
 
 import unittest
-
-import mock
+from unittest import mock
 
 from google.cloud.storage.retry import (
     DEFAULT_RETRY,

tests/unit/test_batch.py

@@ -16,8 +16,8 @@
 from http.client import SERVICE_UNAVAILABLE
 from http.client import NO_CONTENT
 import unittest
+from unittest import mock
 
-import mock
 import requests
 
 

tests/unit/test_blob.py

@@ -22,9 +22,9 @@
 import unittest
 import http.client
 from unittest.mock import patch
+from unittest import mock
 from urllib.parse import urlencode
 
-import mock
 import pytest
 
 from google.cloud.storage import _helpers

tests/unit/test_bucket.py

@@ -14,8 +14,8 @@
 
 import datetime
 import unittest
+from unittest import mock
 
-import mock
 import pytest
 
 from google.cloud.storage.retry import DEFAULT_RETRY

tests/unit/test_client.py

@@ -16,13 +16,13 @@
 import http.client
 import io
 import json
-from unittest.mock import patch
-import mock
 import pytest
 import re
 import requests
 import unittest
 import urllib
+from unittest.mock import patch
+from unittest import mock
 
 from google.api_core import exceptions
 from google.auth.credentials import AnonymousCredentials

tests/unit/test_fileio.py

@@ -17,8 +17,8 @@
 import unittest
 import io
 import string
+from unittest import mock
 
-import mock
 
 from google.api_core.exceptions import RequestRangeNotSatisfiable
 from google.cloud.storage.retry import DEFAULT_RETRY

tests/unit/test_hmac_key.py

@@ -13,8 +13,7 @@
 # limitations under the License.
 
 import unittest
-
-import mock
+from unittest import mock
 
 from google.cloud.storage.retry import DEFAULT_RETRY
 from google.cloud.storage.retry import DEFAULT_RETRY_IF_ETAG_IN_JSON

tests/unit/test_notification.py

@@ -13,8 +13,7 @@
 # limitations under the License.
 
 import unittest
-
-import mock
+from unittest import mock
 
 from google.cloud.storage.retry import DEFAULT_RETRY
 

tests/unit/test_retry.py

@@ -13,11 +13,10 @@
 # limitations under the License.
 
 import unittest
+from unittest import mock
 
 from google.cloud.storage import _helpers
 
-import mock
-
 
 class Test_should_retry(unittest.TestCase):
     def _call_fut(self, exc):