Index: google-auth-2.23.0/tests/compute_engine/test_credentials.py =================================================================== --- google-auth-2.23.0.orig/tests/compute_engine/test_credentials.py +++ google-auth-2.23.0/tests/compute_engine/test_credentials.py @@ -14,7 +14,7 @@ import base64 import datetime -import mock +from unittest import mock import pytest # type: ignore import responses # type: ignore Index: google-auth-2.23.0/tests/compute_engine/test__metadata.py =================================================================== --- google-auth-2.23.0.orig/tests/compute_engine/test__metadata.py +++ google-auth-2.23.0/tests/compute_engine/test__metadata.py @@ -18,7 +18,7 @@ import importlib import json import os -import mock +from unittest import mock import pytest # type: ignore from google.auth import _helpers Index: google-auth-2.23.0/tests/conftest.py =================================================================== --- google-auth-2.23.0.orig/tests/conftest.py +++ google-auth-2.23.0/tests/conftest.py @@ -15,7 +15,7 @@ import os import sys -import mock +from unittest import mock import pytest # type: ignore Index: google-auth-2.23.0/tests/crypt/test__python_rsa.py =================================================================== --- google-auth-2.23.0.orig/tests/crypt/test__python_rsa.py +++ google-auth-2.23.0/tests/crypt/test__python_rsa.py @@ -16,7 +16,7 @@ import io import json import os -import mock +from unittest import mock from pyasn1_modules import pem # type: ignore import pytest # type: ignore import rsa # type: ignore Index: google-auth-2.23.0/tests/oauth2/test_challenges.py =================================================================== --- google-auth-2.23.0.orig/tests/oauth2/test_challenges.py +++ google-auth-2.23.0/tests/oauth2/test_challenges.py @@ -17,7 +17,7 @@ import base64 import sys -import mock +from unittest import mock import pytest # type: ignore import pyu2f # type: ignore Index: google-auth-2.23.0/tests/oauth2/test__client.py =================================================================== --- google-auth-2.23.0.orig/tests/oauth2/test__client.py +++ google-auth-2.23.0/tests/oauth2/test__client.py @@ -18,7 +18,7 @@ import json import os import urllib -import mock +from unittest import mock import pytest # type: ignore from google.auth import _helpers Index: google-auth-2.23.0/tests/oauth2/test_credentials.py =================================================================== --- google-auth-2.23.0.orig/tests/oauth2/test_credentials.py +++ google-auth-2.23.0/tests/oauth2/test_credentials.py @@ -18,7 +18,7 @@ import os import pickle import sys -import mock +from unittest import mock import pytest # type: ignore from google.auth import _helpers Index: google-auth-2.23.0/tests/oauth2/test_gdch_credentials.py =================================================================== --- google-auth-2.23.0.orig/tests/oauth2/test_gdch_credentials.py +++ google-auth-2.23.0/tests/oauth2/test_gdch_credentials.py @@ -17,7 +17,7 @@ import datetime import json import os -import mock +from unittest import mock import pytest # type: ignore import requests Index: google-auth-2.23.0/tests/oauth2/test_id_token.py =================================================================== --- google-auth-2.23.0.orig/tests/oauth2/test_id_token.py +++ google-auth-2.23.0/tests/oauth2/test_id_token.py @@ -15,7 +15,7 @@ import json import os -import mock +from unittest import mock import pytest # type: ignore from google.auth import environment_vars Index: google-auth-2.23.0/tests/oauth2/test_reauth.py =================================================================== --- google-auth-2.23.0.orig/tests/oauth2/test_reauth.py +++ google-auth-2.23.0/tests/oauth2/test_reauth.py @@ -14,7 +14,7 @@ import copy -import mock +from unittest import mock import pytest # type: ignore from google.auth import exceptions Index: google-auth-2.23.0/tests/oauth2/test_service_account.py =================================================================== --- google-auth-2.23.0.orig/tests/oauth2/test_service_account.py +++ google-auth-2.23.0/tests/oauth2/test_service_account.py @@ -16,7 +16,7 @@ import datetime import json import os -import mock +from unittest import mock import pytest # type: ignore from google.auth import _helpers Index: google-auth-2.23.0/tests/oauth2/test_sts.py =================================================================== --- google-auth-2.23.0.orig/tests/oauth2/test_sts.py +++ google-auth-2.23.0/tests/oauth2/test_sts.py @@ -16,7 +16,7 @@ import http.client as http_client import json import urllib -import mock +from unittest import mock import pytest # type: ignore from google.auth import exceptions Index: google-auth-2.23.0/tests/test_app_engine.py =================================================================== --- google-auth-2.23.0.orig/tests/test_app_engine.py +++ google-auth-2.23.0/tests/test_app_engine.py @@ -14,7 +14,7 @@ import datetime -import mock +from unittest import mock import pytest # type: ignore from google.auth import app_engine Index: google-auth-2.23.0/tests/test_aws.py =================================================================== --- google-auth-2.23.0.orig/tests/test_aws.py +++ google-auth-2.23.0/tests/test_aws.py @@ -18,7 +18,7 @@ import json import os import urllib.parse -import mock +from unittest import mock import pytest # type: ignore from google.auth import _helpers Index: google-auth-2.23.0/tests/test__cloud_sdk.py =================================================================== --- google-auth-2.23.0.orig/tests/test__cloud_sdk.py +++ google-auth-2.23.0/tests/test__cloud_sdk.py @@ -18,7 +18,7 @@ import os import subprocess import sys -import mock +from unittest import mock import pytest # type: ignore from google.auth import _cloud_sdk Index: google-auth-2.23.0/tests/test__default.py =================================================================== --- google-auth-2.23.0.orig/tests/test__default.py +++ google-auth-2.23.0/tests/test__default.py @@ -15,7 +15,7 @@ import json import os -import mock +from unittest import mock import pytest # type: ignore from google.auth import _default Index: google-auth-2.23.0/tests/test_downscoped.py =================================================================== --- google-auth-2.23.0.orig/tests/test_downscoped.py +++ google-auth-2.23.0/tests/test_downscoped.py @@ -17,7 +17,7 @@ import http.client as http_client import json import urllib -import mock +from unittest import mock import pytest # type: ignore from google.auth import _helpers Index: google-auth-2.23.0/tests/test__exponential_backoff.py =================================================================== --- google-auth-2.23.0.orig/tests/test__exponential_backoff.py +++ google-auth-2.23.0/tests/test__exponential_backoff.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 from google.auth import _exponential_backoff Index: google-auth-2.23.0/tests/test_external_account_authorized_user.py =================================================================== --- google-auth-2.23.0.orig/tests/test_external_account_authorized_user.py +++ google-auth-2.23.0/tests/test_external_account_authorized_user.py @@ -16,7 +16,7 @@ import datetime import http.client as http_client import json -import mock +from unittest import mock import pytest # type: ignore from google.auth import exceptions Index: google-auth-2.23.0/tests/test_external_account.py =================================================================== --- google-auth-2.23.0.orig/tests/test_external_account.py +++ google-auth-2.23.0/tests/test_external_account.py @@ -17,7 +17,7 @@ import http.client as http_client import json import urllib -import mock +from unittest import mock import pytest # type: ignore from google.auth import _helpers Index: google-auth-2.23.0/tests/test_iam.py =================================================================== --- google-auth-2.23.0.orig/tests/test_iam.py +++ google-auth-2.23.0/tests/test_iam.py @@ -17,7 +17,7 @@ import datetime import http.client as http_client import json -import mock +from unittest import mock import pytest # type: ignore from google.auth import _helpers Index: google-auth-2.23.0/tests/test_identity_pool.py =================================================================== --- google-auth-2.23.0.orig/tests/test_identity_pool.py +++ google-auth-2.23.0/tests/test_identity_pool.py @@ -18,7 +18,7 @@ import json import os import urllib -import mock +from unittest import mock import pytest # type: ignore from google.auth import _helpers Index: google-auth-2.23.0/tests/test_impersonated_credentials.py =================================================================== --- google-auth-2.23.0.orig/tests/test_impersonated_credentials.py +++ google-auth-2.23.0/tests/test_impersonated_credentials.py @@ -17,7 +17,7 @@ import http.client as http_client import json import os -import mock +from unittest import mock import pytest # type: ignore from google.auth import _helpers Index: google-auth-2.23.0/tests/test_jwt.py =================================================================== --- google-auth-2.23.0.orig/tests/test_jwt.py +++ google-auth-2.23.0/tests/test_jwt.py @@ -17,7 +17,7 @@ import datetime import json import os -import mock +from unittest import mock import pytest # type: ignore from google.auth import _helpers Index: google-auth-2.23.0/tests/test_metrics.py =================================================================== --- google-auth-2.23.0.orig/tests/test_metrics.py +++ google-auth-2.23.0/tests/test_metrics.py @@ -14,7 +14,7 @@ import platform -import mock +from unittest import mock from google.auth import metrics from google.auth import version Index: google-auth-2.23.0/tests/test__oauth2client.py =================================================================== --- google-auth-2.23.0.orig/tests/test__oauth2client.py +++ google-auth-2.23.0/tests/test__oauth2client.py @@ -17,7 +17,7 @@ import importlib import os import sys -import mock +from unittest import mock import pytest # type: ignore try: Index: google-auth-2.23.0/tests/test_pluggable.py =================================================================== --- google-auth-2.23.0.orig/tests/test_pluggable.py +++ google-auth-2.23.0/tests/test_pluggable.py @@ -16,7 +16,7 @@ import json import os import subprocess -import mock +from unittest import mock import pytest # type: ignore from google.auth import exceptions Index: google-auth-2.23.0/tests/transport/test__custom_tls_signer.py =================================================================== --- google-auth-2.23.0.orig/tests/transport/test__custom_tls_signer.py +++ google-auth-2.23.0/tests/transport/test__custom_tls_signer.py @@ -16,7 +16,7 @@ import base64 import ctypes import os -import mock +from unittest import mock import pytest # type: ignore from requests.packages.urllib3.util.ssl_ import create_urllib3_context # type: ignore import urllib3.contrib.pyopenssl # type: ignore Index: google-auth-2.23.0/tests/transport/test_grpc.py =================================================================== --- google-auth-2.23.0.orig/tests/transport/test_grpc.py +++ google-auth-2.23.0/tests/transport/test_grpc.py @@ -16,7 +16,7 @@ import datetime import os import time -import mock +from unittest import mock import pytest # type: ignore from google.auth import _helpers Index: google-auth-2.23.0/tests/transport/test__mtls_helper.py =================================================================== --- google-auth-2.23.0.orig/tests/transport/test__mtls_helper.py +++ google-auth-2.23.0/tests/transport/test__mtls_helper.py @@ -15,7 +15,7 @@ import os import re -import mock +from unittest import mock from OpenSSL import crypto import pytest # type: ignore Index: google-auth-2.23.0/tests/transport/test_mtls.py =================================================================== --- google-auth-2.23.0.orig/tests/transport/test_mtls.py +++ google-auth-2.23.0/tests/transport/test_mtls.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 pytest # type: ignore from google.auth import exceptions Index: google-auth-2.23.0/tests/transport/test_requests.py =================================================================== --- google-auth-2.23.0.orig/tests/transport/test_requests.py +++ google-auth-2.23.0/tests/transport/test_requests.py @@ -19,7 +19,7 @@ import os import sys import freezegun -import mock +from unittest import mock import OpenSSL import pytest # type: ignore import requests Index: google-auth-2.23.0/tests/transport/test_urllib3.py =================================================================== --- google-auth-2.23.0.orig/tests/transport/test_urllib3.py +++ google-auth-2.23.0/tests/transport/test_urllib3.py @@ -16,7 +16,7 @@ import http.client as http_client import os import sys -import mock +from unittest import mock import OpenSSL import pytest # type: ignore import urllib3 # type: ignore