remove use of old external "mock" module

noxfile.py

@@ -79,7 +79,6 @@ def mypy(session):
         "types-pyOpenSSL",
         "types-requests",
         "types-setuptools",
-        "types-mock",
     )
     session.run("mypy", "-p", "google", "-p", "tests", "-p", "tests_async")
 

setup.py

@@ -56,7 +56,6 @@
     "grpcio",
     "flask",
     "freezegun",
-    "mock",
     # TODO(https://github.com/googleapis/google-auth-library-python/issues/1736): Remove `oauth2client` from testing requirements once an extra is added for `oauth2client` dependency.
     "oauth2client",
     *pyjwt_extra_require,

system_tests/system_tests_sync/test_external_accounts.py

@@ -48,7 +48,7 @@
 from http.server import HTTPServer
 from google.oauth2 import service_account
 import pytest
-from mock import patch
+from unittest.mock import patch
 
 # Populate values from the output of scripts/setup_external_accounts.sh.
 _AUDIENCE_OIDC = "//iam.googleapis.com/projects/79992041559/locations/global/workloadIdentityPools/pool-73wslmxn/providers/oidc-73wslmxn"

system_tests/system_tests_sync/test_mtls_http.py

@@ -13,10 +13,10 @@
 # limitations under the License.
 
 import json
-import mock
 import os
 import time
 from os import path
+from unittest import mock
 
 
 import google.auth

tests/compute_engine/test__metadata.py

@@ -17,8 +17,8 @@
 import importlib
 import json
 import os
+from unittest import mock
 
-import mock
 import pytest  # type: ignore
 
 from google.auth import _helpers

tests/compute_engine/test_credentials.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 import base64
 import datetime
+from unittest import mock
 
-import mock
 import pytest  # type: ignore
 import responses  # type: ignore
 

tests/conftest.py

@@ -14,8 +14,8 @@
 
 import os
 import sys
+from unittest import mock
 
-import mock
 import pytest  # type: ignore
 
 

tests/crypt/test__python_rsa.py

@@ -15,8 +15,8 @@
 import io
 import json
 import os
+from unittest import mock
 
-import mock
 from pyasn1_modules import pem  # type: ignore
 import pytest  # type: ignore
 import rsa  # type: ignore

tests/oauth2/test__client.py

@@ -17,8 +17,8 @@
 import json
 import os
 import urllib
+from unittest import mock
 
-import mock
 import pytest  # type: ignore
 
 from google.auth import _helpers

tests/oauth2/test_challenges.py

@@ -17,8 +17,8 @@
 import base64
 import os
 import sys
+from unitest import mock
 
-import mock
 import pytest  # type: ignore
 import pyu2f  # type: ignore
 

tests/oauth2/test_credentials.py

@@ -17,8 +17,8 @@
 import os
 import pickle
 import sys
+from unittest import mock
 
-import mock
 import pytest  # type: ignore
 
 from google.auth import _helpers

tests/oauth2/test_gdch_credentials.py

@@ -16,8 +16,8 @@
 import datetime
 import json
 import os
+from unittest import mock
 
-import mock
 import pytest  # type: ignore
 import requests
 

tests/oauth2/test_id_token.py

@@ -14,8 +14,8 @@
 
 import json
 import os
+from unittest import mock
 
-import mock
 import pytest  # type: ignore
 
 from google.auth import environment_vars

tests/oauth2/test_reauth.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import copy
+from unittest import mock
 
-import mock
 import pytest  # type: ignore
 
 from google.auth import exceptions

tests/oauth2/test_service_account.py

@@ -15,8 +15,8 @@
 import datetime
 import json
 import os
+from unittest import mock
 
-import mock
 import pytest  # type: ignore
 
 from google.auth import _helpers

tests/oauth2/test_sts.py

@@ -15,8 +15,8 @@
 import http.client as http_client
 import json
 import urllib
+from unittest import mock
 
-import mock
 import pytest  # type: ignore
 
 from google.auth import exceptions

tests/oauth2/test_webauthn_handler.py

@@ -1,7 +1,7 @@
 import json
 import struct
+from unittest import mock
 
-import mock
 import pytest  # type: ignore
 
 from google.auth import exceptions

tests/oauth2/test_webauthn_handler_factory.py

@@ -1,4 +1,5 @@
-import mock
+from unittest import mock
+
 import pytest  # type: ignore
 
 from google.oauth2 import webauthn_handler

tests/test__cloud_sdk.py

@@ -17,8 +17,8 @@
 import os
 import subprocess
 import sys
+from unittest import mock
 
-import mock
 import pytest  # type: ignore
 
 from google.auth import _cloud_sdk

tests/test__default.py

@@ -14,8 +14,8 @@
 
 import json
 import os
+from unittest import mock
 
-import mock
 import pytest  # type: ignore
 
 from google.auth import _default

tests/test__exponential_backoff.py

@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
+
 import pytest  # type: ignore
 
 from google.auth import _exponential_backoff

tests/test__oauth2client.py

@@ -16,8 +16,8 @@
 import importlib
 import os
 import sys
+from unittest import mock
 
-import mock
 import pytest  # type: ignore
 
 try:

tests/test__refresh_worker.py

@@ -16,8 +16,8 @@
 import random
 import threading
 import time
+from unittest import mock
 
-import mock
 import pytest  # type: ignore
 
 from google.auth import _refresh_worker, credentials, exceptions

tests/test_app_engine.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import datetime
+from unittest import mock
 
-import mock
 import pytest  # type: ignore
 
 from google.auth import app_engine

tests/test_aws.py

@@ -17,8 +17,8 @@
 import json
 import os
 import urllib.parse
+from unittest import mock
 
-import mock
 import pytest  # type: ignore
 
 from google.auth import _helpers, external_account

tests/test_credentials.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import datetime
+from unittest import mock
 
-import mock
 import pytest  # type: ignore
 
 from google.auth import _helpers

tests/test_downscoped.py

@@ -16,8 +16,8 @@
 import http.client as http_client
 import json
 import urllib
+from unittest import mock
 
-import mock
 import pytest  # type: ignore
 
 from google.auth import _helpers

tests/test_external_account.py

@@ -16,8 +16,8 @@
 import http.client as http_client
 import json
 import urllib
+from unittest import mock
 
-import mock
 import pytest  # type: ignore
 
 from google.auth import _helpers

tests/test_external_account_authorized_user.py

@@ -15,8 +15,8 @@
 import datetime
 import http.client as http_client
 import json
+from unittest import mock
 
-import mock
 import pytest  # type: ignore
 
 from google.auth import exceptions

tests/test_iam.py

@@ -16,8 +16,8 @@
 import datetime
 import http.client as http_client
 import json
+from unittest import mock
 
-import mock
 import pytest  # type: ignore
 
 from google.auth import _helpers

tests/test_identity_pool.py

@@ -18,8 +18,8 @@
 import json
 import os
 import urllib
+from unittest import mock
 
-import mock
 from OpenSSL import crypto
 import pytest  # type: ignore
 

tests/test_impersonated_credentials.py

@@ -17,8 +17,8 @@
 import http.client as http_client
 import json
 import os
+from unittest import mock
 
-import mock
 import pytest  # type: ignore
 
 from google.auth import _helpers

tests/test_jwt.py

@@ -16,8 +16,8 @@
 import datetime
 import json
 import os
+from unittest import mock
 
-import mock
 import pytest  # type: ignore
 
 from google.auth import _helpers

tests/test_metrics.py

@@ -13,8 +13,7 @@
 # limitations under the License.
 
 import platform
-
-import mock
+from unittest import mock
 
 from google.auth import metrics
 from google.auth import version

tests/test_pluggable.py

@@ -15,8 +15,8 @@
 import json
 import os
 import subprocess
+from unittest import mock
 
-import mock
 import pytest  # type: ignore
 
 from google.auth import exceptions

tests/transport/aio/test_aiohttp.py

@@ -13,9 +13,9 @@
 # limitations under the License.
 
 import asyncio
+from unittest.mock import AsyncMock, Mock, patch
 
 from aioresponses import aioresponses  # type: ignore
-from mock import AsyncMock, Mock, patch
 import pytest  # type: ignore
 import pytest_asyncio  # type: ignore
 

tests/transport/aio/test_sessions.py

@@ -14,9 +14,9 @@
 
 import asyncio
 from typing import AsyncGenerator
+from unittest.mock import Mock, patch
 
 from aioresponses import aioresponses  # type: ignore
-from mock import Mock, patch
 import pytest  # type: ignore
 
 from google.auth.aio.credentials import AnonymousCredentials

tests/transport/test__custom_tls_signer.py

@@ -14,8 +14,8 @@
 import base64
 import ctypes
 import os
+from unittest import mock
 
-import mock
 import pytest  # type: ignore
 from requests.packages.urllib3.util.ssl_ import create_urllib3_context  # type: ignore
 import urllib3.contrib.pyopenssl  # type: ignore

tests/transport/test__mtls_helper.py

@@ -14,8 +14,8 @@
 
 import os
 import re
+from unittes import mock
 
-import mock
 from OpenSSL import crypto
 import pytest  # type: ignore
 

tests/transport/test_grpc.py

@@ -15,8 +15,8 @@
 import datetime
 import os
 import time
+from unittest import mock
 
-import mock
 import pytest  # type: ignore
 
 from google.auth import _helpers