diff -Nru google-auth-2.30.0.orig/tests/compute_engine/test_credentials.py google-auth-2.30.0/tests/compute_engine/test_credentials.py --- google-auth-2.30.0.orig/tests/compute_engine/test_credentials.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/compute_engine/test_credentials.py 2024-07-04 10:10:10.154047522 +0200 @@ -14,7 +14,7 @@ import base64 import datetime -import mock +from unittest import mock import pytest # type: ignore import responses # type: ignore diff -Nru google-auth-2.30.0.orig/tests/compute_engine/test__metadata.py google-auth-2.30.0/tests/compute_engine/test__metadata.py --- google-auth-2.30.0.orig/tests/compute_engine/test__metadata.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/compute_engine/test__metadata.py 2024-07-04 10:10:10.157380876 +0200 @@ -18,7 +18,7 @@ import json import os -import mock +from unittest import mock import pytest # type: ignore from google.auth import _helpers diff -Nru google-auth-2.30.0.orig/tests/conftest.py google-auth-2.30.0/tests/conftest.py --- google-auth-2.30.0.orig/tests/conftest.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/conftest.py 2024-07-04 10:10:10.064046957 +0200 @@ -15,7 +15,7 @@ import os import sys -import mock +from unittest import mock import pytest # type: ignore diff -Nru google-auth-2.30.0.orig/tests/crypt/test__python_rsa.py google-auth-2.30.0/tests/crypt/test__python_rsa.py --- google-auth-2.30.0.orig/tests/crypt/test__python_rsa.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/crypt/test__python_rsa.py 2024-07-04 10:10:10.184047711 +0200 @@ -16,7 +16,7 @@ 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 diff -Nru google-auth-2.30.0.orig/tests/oauth2/test_challenges.py google-auth-2.30.0/tests/oauth2/test_challenges.py --- google-auth-2.30.0.orig/tests/oauth2/test_challenges.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/oauth2/test_challenges.py 2024-07-04 10:10:10.130714042 +0200 @@ -18,7 +18,7 @@ import os import sys -import mock +from unittest import mock import pytest # type: ignore import pyu2f # type: ignore diff -Nru google-auth-2.30.0.orig/tests/oauth2/test__client.py google-auth-2.30.0/tests/oauth2/test__client.py --- google-auth-2.30.0.orig/tests/oauth2/test__client.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/oauth2/test__client.py 2024-07-04 10:10:10.117380625 +0200 @@ -18,7 +18,7 @@ import os import urllib -import mock +from unittest import mock import pytest # type: ignore from google.auth import _helpers diff -Nru google-auth-2.30.0.orig/tests/oauth2/test_credentials.py google-auth-2.30.0/tests/oauth2/test_credentials.py --- google-auth-2.30.0.orig/tests/oauth2/test_credentials.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/oauth2/test_credentials.py 2024-07-04 10:10:10.124047334 +0200 @@ -18,7 +18,7 @@ import pickle import sys -import mock +from unittest import mock import pytest # type: ignore from google.auth import _helpers diff -Nru google-auth-2.30.0.orig/tests/oauth2/test_gdch_credentials.py google-auth-2.30.0/tests/oauth2/test_gdch_credentials.py --- google-auth-2.30.0.orig/tests/oauth2/test_gdch_credentials.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/oauth2/test_gdch_credentials.py 2024-07-04 10:10:10.110713917 +0200 @@ -17,7 +17,7 @@ import json import os -import mock +from unittest import mock import pytest # type: ignore import requests diff -Nru google-auth-2.30.0.orig/tests/oauth2/test_id_token.py google-auth-2.30.0/tests/oauth2/test_id_token.py --- google-auth-2.30.0.orig/tests/oauth2/test_id_token.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/oauth2/test_id_token.py 2024-07-04 10:10:10.110713917 +0200 @@ -15,7 +15,7 @@ import json import os -import mock +from unittest import mock import pytest # type: ignore from google.auth import environment_vars diff -Nru google-auth-2.30.0.orig/tests/oauth2/test_reauth.py google-auth-2.30.0/tests/oauth2/test_reauth.py --- google-auth-2.30.0.orig/tests/oauth2/test_reauth.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/oauth2/test_reauth.py 2024-07-04 10:10:10.127380688 +0200 @@ -14,7 +14,7 @@ import copy -import mock +from unittest import mock import pytest # type: ignore from google.auth import exceptions diff -Nru google-auth-2.30.0.orig/tests/oauth2/test_service_account.py google-auth-2.30.0/tests/oauth2/test_service_account.py --- google-auth-2.30.0.orig/tests/oauth2/test_service_account.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/oauth2/test_service_account.py 2024-07-04 10:10:10.120713979 +0200 @@ -16,7 +16,7 @@ import json import os -import mock +from unittest import mock import pytest # type: ignore from google.auth import _helpers diff -Nru google-auth-2.30.0.orig/tests/oauth2/test_sts.py google-auth-2.30.0/tests/oauth2/test_sts.py --- google-auth-2.30.0.orig/tests/oauth2/test_sts.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/oauth2/test_sts.py 2024-07-04 10:10:10.134047397 +0200 @@ -16,7 +16,7 @@ import json import urllib -import mock +from unittest import mock import pytest # type: ignore from google.auth import exceptions diff -Nru google-auth-2.30.0.orig/tests/oauth2/test_webauthn_handler_factory.py google-auth-2.30.0/tests/oauth2/test_webauthn_handler_factory.py --- google-auth-2.30.0.orig/tests/oauth2/test_webauthn_handler_factory.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/oauth2/test_webauthn_handler_factory.py 2024-07-04 10:10:10.137380751 +0200 @@ -1,4 +1,4 @@ -import mock +from unittest import mock import pytest # type: ignore from google.oauth2 import webauthn_handler diff -Nru google-auth-2.30.0.orig/tests/oauth2/test_webauthn_handler.py google-auth-2.30.0/tests/oauth2/test_webauthn_handler.py --- google-auth-2.30.0.orig/tests/oauth2/test_webauthn_handler.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/oauth2/test_webauthn_handler.py 2024-07-04 10:10:10.114047271 +0200 @@ -1,7 +1,7 @@ import json import struct -import mock +from unittest import mock import pytest # type: ignore from google.auth import exceptions diff -Nru google-auth-2.30.0.orig/tests/test_app_engine.py google-auth-2.30.0/tests/test_app_engine.py --- google-auth-2.30.0.orig/tests/test_app_engine.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/test_app_engine.py 2024-07-04 10:10:10.090713791 +0200 @@ -14,7 +14,7 @@ import datetime -import mock +from unittest import mock import pytest # type: ignore from google.auth import app_engine diff -Nru google-auth-2.30.0.orig/tests/test_aws.py google-auth-2.30.0/tests/test_aws.py --- google-auth-2.30.0.orig/tests/test_aws.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/test_aws.py 2024-07-04 10:10:10.204047836 +0200 @@ -18,7 +18,7 @@ import os import urllib.parse -import mock +from unittest import mock import pytest # type: ignore from google.auth import _helpers, external_account diff -Nru google-auth-2.30.0.orig/tests/test__cloud_sdk.py google-auth-2.30.0/tests/test__cloud_sdk.py --- google-auth-2.30.0.orig/tests/test__cloud_sdk.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/test__cloud_sdk.py 2024-07-04 10:10:10.100713854 +0200 @@ -18,7 +18,7 @@ import subprocess import sys -import mock +from unittest import mock import pytest # type: ignore from google.auth import _cloud_sdk diff -Nru google-auth-2.30.0.orig/tests/test_credentials.py google-auth-2.30.0/tests/test_credentials.py --- google-auth-2.30.0.orig/tests/test_credentials.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/test_credentials.py 2024-07-04 10:10:10.144047460 +0200 @@ -14,7 +14,7 @@ import datetime -import mock +from unittest import mock import pytest # type: ignore from google.auth import _helpers diff -Nru google-auth-2.30.0.orig/tests/test__default.py google-auth-2.30.0/tests/test__default.py --- google-auth-2.30.0.orig/tests/test__default.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/test__default.py 2024-07-04 10:10:10.147380814 +0200 @@ -15,7 +15,7 @@ import json import os -import mock +from unittest import mock import pytest # type: ignore from google.auth import _default diff -Nru google-auth-2.30.0.orig/tests/test_downscoped.py google-auth-2.30.0/tests/test_downscoped.py --- google-auth-2.30.0.orig/tests/test_downscoped.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/test_downscoped.py 2024-07-04 10:10:10.154047522 +0200 @@ -17,7 +17,7 @@ import json import urllib -import mock +from unittest import mock import pytest # type: ignore from google.auth import _helpers diff -Nru google-auth-2.30.0.orig/tests/test__exponential_backoff.py google-auth-2.30.0/tests/test__exponential_backoff.py --- google-auth-2.30.0.orig/tests/test__exponential_backoff.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/test__exponential_backoff.py 2024-07-04 10:10:10.054046894 +0200 @@ -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 diff -Nru google-auth-2.30.0.orig/tests/test_external_account_authorized_user.py google-auth-2.30.0/tests/test_external_account_authorized_user.py --- google-auth-2.30.0.orig/tests/test_external_account_authorized_user.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/test_external_account_authorized_user.py 2024-07-04 10:10:10.150714168 +0200 @@ -16,7 +16,7 @@ import http.client as http_client import json -import mock +from unittest import mock import pytest # type: ignore from google.auth import exceptions diff -Nru google-auth-2.30.0.orig/tests/test_external_account.py google-auth-2.30.0/tests/test_external_account.py --- google-auth-2.30.0.orig/tests/test_external_account.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/test_external_account.py 2024-07-04 10:10:10.057380248 +0200 @@ -17,7 +17,7 @@ import json import urllib -import mock +from unittest import mock import pytest # type: ignore from google.auth import _helpers diff -Nru google-auth-2.30.0.orig/tests/test_iam.py google-auth-2.30.0/tests/test_iam.py --- google-auth-2.30.0.orig/tests/test_iam.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/test_iam.py 2024-07-04 10:10:10.164047585 +0200 @@ -17,7 +17,7 @@ import http.client as http_client import json -import mock +from unittest import mock import pytest # type: ignore from google.auth import _helpers diff -Nru google-auth-2.30.0.orig/tests/test_identity_pool.py google-auth-2.30.0/tests/test_identity_pool.py --- google-auth-2.30.0.orig/tests/test_identity_pool.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/test_identity_pool.py 2024-07-04 10:10:10.167380939 +0200 @@ -18,7 +18,7 @@ import os import urllib -import mock +from unittest import mock import pytest # type: ignore from google.auth import _helpers, external_account diff -Nru google-auth-2.30.0.orig/tests/test_impersonated_credentials.py google-auth-2.30.0/tests/test_impersonated_credentials.py --- google-auth-2.30.0.orig/tests/test_impersonated_credentials.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/test_impersonated_credentials.py 2024-07-04 10:10:10.200714482 +0200 @@ -17,7 +17,7 @@ import json import os -import mock +from unittest import mock import pytest # type: ignore from google.auth import _helpers diff -Nru google-auth-2.30.0.orig/tests/test_jwt.py google-auth-2.30.0/tests/test_jwt.py --- google-auth-2.30.0.orig/tests/test_jwt.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/test_jwt.py 2024-07-04 10:10:10.170714294 +0200 @@ -17,7 +17,7 @@ import json import os -import mock +from unittest import mock import pytest # type: ignore from google.auth import _helpers diff -Nru google-auth-2.30.0.orig/tests/test_metrics.py google-auth-2.30.0/tests/test_metrics.py --- google-auth-2.30.0.orig/tests/test_metrics.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/test_metrics.py 2024-07-04 10:10:10.107380563 +0200 @@ -14,7 +14,7 @@ import platform -import mock +from unittest import mock from google.auth import metrics from google.auth import version diff -Nru google-auth-2.30.0.orig/tests/test__oauth2client.py google-auth-2.30.0/tests/test__oauth2client.py --- google-auth-2.30.0.orig/tests/test__oauth2client.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/test__oauth2client.py 2024-07-04 10:10:10.094047145 +0200 @@ -17,7 +17,7 @@ import os import sys -import mock +from unittest import mock import pytest # type: ignore try: diff -Nru google-auth-2.30.0.orig/tests/test_pluggable.py google-auth-2.30.0/tests/test_pluggable.py --- google-auth-2.30.0.orig/tests/test_pluggable.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/test_pluggable.py 2024-07-04 10:10:10.200714482 +0200 @@ -16,7 +16,7 @@ import os import subprocess -import mock +from unittest import mock import pytest # type: ignore from google.auth import exceptions diff -Nru google-auth-2.30.0.orig/tests/test__refresh_worker.py google-auth-2.30.0/tests/test__refresh_worker.py --- google-auth-2.30.0.orig/tests/test__refresh_worker.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/test__refresh_worker.py 2024-07-04 10:10:10.187381065 +0200 @@ -17,7 +17,7 @@ import threading import time -import mock +from unittest import mock import pytest # type: ignore from google.auth import _refresh_worker, credentials, exceptions diff -Nru google-auth-2.30.0.orig/tests/transport/test__custom_tls_signer.py google-auth-2.30.0/tests/transport/test__custom_tls_signer.py --- google-auth-2.30.0.orig/tests/transport/test__custom_tls_signer.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/transport/test__custom_tls_signer.py 2024-07-04 10:10:10.067380311 +0200 @@ -15,7 +15,7 @@ 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 diff -Nru google-auth-2.30.0.orig/tests/transport/test_grpc.py google-auth-2.30.0/tests/transport/test_grpc.py --- google-auth-2.30.0.orig/tests/transport/test_grpc.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/transport/test_grpc.py 2024-07-04 10:10:10.070713666 +0200 @@ -16,7 +16,7 @@ import os import time -import mock +from unittest import mock import pytest # type: ignore from google.auth import _helpers diff -Nru google-auth-2.30.0.orig/tests/transport/test__mtls_helper.py google-auth-2.30.0/tests/transport/test__mtls_helper.py --- google-auth-2.30.0.orig/tests/transport/test__mtls_helper.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/transport/test__mtls_helper.py 2024-07-04 10:10:10.077380374 +0200 @@ -15,7 +15,7 @@ import os import re -import mock +from unittest import mock from OpenSSL import crypto import pytest # type: ignore diff -Nru google-auth-2.30.0.orig/tests/transport/test_mtls.py google-auth-2.30.0/tests/transport/test_mtls.py --- google-auth-2.30.0.orig/tests/transport/test_mtls.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/transport/test_mtls.py 2024-07-04 10:10:10.080713728 +0200 @@ -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 diff -Nru google-auth-2.30.0.orig/tests/transport/test_requests.py google-auth-2.30.0/tests/transport/test_requests.py --- google-auth-2.30.0.orig/tests/transport/test_requests.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/transport/test_requests.py 2024-07-04 10:10:10.084047083 +0200 @@ -19,7 +19,7 @@ import sys import freezegun -import mock +from unittest import mock import OpenSSL import pytest # type: ignore import requests diff -Nru google-auth-2.30.0.orig/tests/transport/test_urllib3.py google-auth-2.30.0/tests/transport/test_urllib3.py --- google-auth-2.30.0.orig/tests/transport/test_urllib3.py 2024-06-07 01:17:33.000000000 +0200 +++ google-auth-2.30.0/tests/transport/test_urllib3.py 2024-07-04 10:10:10.064046957 +0200 @@ -16,7 +16,7 @@ import os import sys -import mock +from unittest import mock import OpenSSL import pytest # type: ignore import urllib3 # type: ignore