diff --git a/tests/compute_engine/test__metadata.py b/tests/compute_engine/test__metadata.py index 8b5eece..c376dbf 100644 --- a/tests/compute_engine/test__metadata.py +++ b/tests/compute_engine/test__metadata.py @@ -16,7 +16,7 @@ import datetime import json import os -import mock +from unittest import mock import pytest from six.moves import http_client from six.moves import reload_module diff --git a/tests/compute_engine/test_credentials.py b/tests/compute_engine/test_credentials.py index 98def0f..486eb61 100644 --- a/tests/compute_engine/test_credentials.py +++ b/tests/compute_engine/test_credentials.py @@ -14,7 +14,7 @@ import base64 import datetime -import mock +from unittest import mock import pytest import responses diff --git a/tests/conftest.py b/tests/conftest.py index cf8a0f9..7b5eb1d 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -15,7 +15,7 @@ import os import sys -import mock +from unittest import mock import pytest diff --git a/tests/crypt/test__python_rsa.py b/tests/crypt/test__python_rsa.py index 886ee55..f2d3115 100644 --- a/tests/crypt/test__python_rsa.py +++ b/tests/crypt/test__python_rsa.py @@ -15,7 +15,7 @@ import json import os -import mock +from unittest import mock from pyasn1_modules import pem import pytest import rsa diff --git a/tests/oauth2/test__client.py b/tests/oauth2/test__client.py index c3ae2af..f2c22ab 100644 --- a/tests/oauth2/test__client.py +++ b/tests/oauth2/test__client.py @@ -16,7 +16,7 @@ import datetime import json import os -import mock +from unittest import mock import pytest import six from six.moves import http_client diff --git a/tests/oauth2/test_credentials.py b/tests/oauth2/test_credentials.py index 76aa463..93126e1 100644 --- a/tests/oauth2/test_credentials.py +++ b/tests/oauth2/test_credentials.py @@ -18,7 +18,7 @@ import os import pickle import sys -import mock +from unittest import mock import pytest from google.auth import _helpers diff --git a/tests/oauth2/test_id_token.py b/tests/oauth2/test_id_token.py index ff85807..28750cc 100644 --- a/tests/oauth2/test_id_token.py +++ b/tests/oauth2/test_id_token.py @@ -15,7 +15,7 @@ import json import os -import mock +from unittest import mock import pytest from google.auth import environment_vars diff --git a/tests/oauth2/test_service_account.py b/tests/oauth2/test_service_account.py index 897374a..70460bc 100644 --- a/tests/oauth2/test_service_account.py +++ b/tests/oauth2/test_service_account.py @@ -16,7 +16,7 @@ import datetime import json import os -import mock +from unittest import mock from google.auth import _helpers from google.auth import crypt diff --git a/tests/test__cloud_sdk.py b/tests/test__cloud_sdk.py index 3377604..f8063fd 100644 --- a/tests/test__cloud_sdk.py +++ b/tests/test__cloud_sdk.py @@ -17,7 +17,7 @@ import json import os import subprocess -import mock +from unittest import mock import pytest from google.auth import _cloud_sdk diff --git a/tests/test__default.py b/tests/test__default.py index 35000b0..8ef8b6c 100644 --- a/tests/test__default.py +++ b/tests/test__default.py @@ -15,7 +15,7 @@ import json import os -import mock +from unittest import mock import pytest from google.auth import _default diff --git a/tests/test__oauth2client.py b/tests/test__oauth2client.py index 6b1112b..9002a40 100644 --- a/tests/test__oauth2client.py +++ b/tests/test__oauth2client.py @@ -16,7 +16,7 @@ import datetime import os import sys -import mock +from unittest import mock import oauth2client.client import oauth2client.contrib.gce import oauth2client.service_account diff --git a/tests/test_app_engine.py b/tests/test_app_engine.py index 9dfdfa6..e363bad 100644 --- a/tests/test_app_engine.py +++ b/tests/test_app_engine.py @@ -14,7 +14,7 @@ import datetime -import mock +from unittest import mock import pytest from google.auth import app_engine diff --git a/tests/test_iam.py b/tests/test_iam.py index c98a138..9555592 100644 --- a/tests/test_iam.py +++ b/tests/test_iam.py @@ -16,7 +16,7 @@ import base64 import datetime import json -import mock +from unittest import mock import pytest from six.moves import http_client diff --git a/tests/test_impersonated_credentials.py b/tests/test_impersonated_credentials.py index 31075ca..175cd56 100644 --- a/tests/test_impersonated_credentials.py +++ b/tests/test_impersonated_credentials.py @@ -16,7 +16,7 @@ import datetime import json import os -import mock +from unittest import mock import pytest from six.moves import http_client diff --git a/tests/test_jwt.py b/tests/test_jwt.py index 488aee4..5a8cb50 100644 --- a/tests/test_jwt.py +++ b/tests/test_jwt.py @@ -17,7 +17,7 @@ import datetime import json import os -import mock +from unittest import mock import pytest from google.auth import _helpers diff --git a/tests/transport/test__mtls_helper.py b/tests/transport/test__mtls_helper.py index 5bf1967..1d0ad26 100644 --- a/tests/transport/test__mtls_helper.py +++ b/tests/transport/test__mtls_helper.py @@ -15,7 +15,7 @@ import os import re -import mock +from unittest import mock import pytest from google.auth.transport import _mtls_helper diff --git a/tests/transport/test_grpc.py b/tests/transport/test_grpc.py index 5c61f96..dcf337f 100644 --- a/tests/transport/test_grpc.py +++ b/tests/transport/test_grpc.py @@ -16,7 +16,7 @@ import datetime import os import time -import mock +from unittest import mock import pytest from google.auth import _helpers diff --git a/tests/transport/test_requests.py b/tests/transport/test_requests.py index d6770de..7792c32 100644 --- a/tests/transport/test_requests.py +++ b/tests/transport/test_requests.py @@ -17,7 +17,7 @@ import functools import sys import freezegun -import mock +from unittest import mock import OpenSSL import pytest import requests diff --git a/tests/transport/test_urllib3.py b/tests/transport/test_urllib3.py index a25fcd7..97a1df3 100644 --- a/tests/transport/test_urllib3.py +++ b/tests/transport/test_urllib3.py @@ -14,7 +14,7 @@ import sys -import mock +from unittest import mock import OpenSSL import pytest from six.moves import http_client