fix: remove use of old external mock

google/api_core/exceptions.py

@@ -18,9 +18,6 @@
 on :mod:`google.api_core`, including both HTTP and gRPC clients.
 """
 
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import http.client
 from typing import Dict
 from typing import Union

google/api_core/path_template.py

@@ -23,8 +23,6 @@
 .. _resource names: https://cloud.google.com/apis/design/resource_names
 """
 
-from __future__ import unicode_literals
-
 from collections import deque
 import copy
 import functools

google/api_core/timeout.py

@@ -52,8 +52,6 @@ def is_thing_ready(timeout=None):
 matches ``api_method(request, timeout=None, retry=None)``.
 """
 
-from __future__ import unicode_literals
-
 import datetime
 import functools
 

noxfile.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import absolute_import
 import os
 import pathlib
 import re
@@ -122,7 +121,6 @@ def default(session, install_grpc=True, prerelease=False):
 
     session.install(
         "dataclasses",
-        "mock",
         "pytest",
         "pytest-cov",
         "pytest-xdist",
@@ -252,7 +250,6 @@ def mypy(session):
         "types-setuptools",
         "types-requests",
         "types-protobuf",
-        "types-mock",
         "types-dataclasses",
     )
     session.run("mypy", "google", "tests")

tests/asyncio/future/test_async_future.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import asyncio
+from unittest import mock
 
-import mock
 import pytest
 
 from google.api_core import exceptions

tests/asyncio/gapic/test_method_async.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import datetime
+from unittest import mock
 
-import mock
 import pytest
 
 try:

tests/asyncio/operations_v1/test_operations_async_client.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
 
 try:

tests/asyncio/retry/test_retry_streaming_async.py

@@ -15,8 +15,8 @@
 import datetime
 import re
 import asyncio
+from unittest import mock
 
-import mock
 import pytest
 
 from google.api_core import exceptions

tests/asyncio/retry/test_retry_unary_async.py

@@ -14,8 +14,8 @@
 
 import datetime
 import re
+from unittest import mock
 
-import mock
 import pytest
 
 from google.api_core import exceptions

tests/asyncio/test_grpc_helpers_async.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  # noqa: I202
 
 try:

tests/asyncio/test_operation_async.py

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from unittest import mock
 
-import mock
 import pytest
 
 try:

tests/asyncio/test_page_iterator_async.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import inspect
+from unittest import mock
 
-import mock
 import pytest
 
 from google.api_core import page_iterator_async

tests/unit/future/test__helpers.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.api_core.future import _helpers
 

tests/unit/future/test_polling.py

@@ -15,8 +15,8 @@
 import concurrent.futures
 import threading
 import time
+from unittest import mock
 
-import mock
 import pytest
 
 from google.api_core import exceptions, retry

tests/unit/gapic/test_method.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import datetime
+from unittest import mock
 
-import mock
 import pytest
 
 try:

tests/unit/operations_v1/test_operations_rest_client.py

@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 import os
+from unittest import mock
 
-import mock
 import pytest
 
 try:

tests/unit/retry/test_retry_base.py

@@ -14,8 +14,8 @@
 
 import itertools
 import re
+from unittest import mock
 
-import mock
 import pytest
 import requests.exceptions
 

tests/unit/retry/test_retry_streaming.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import re
+from unittest import mock
 
-import mock
 import pytest
 
 from google.api_core import exceptions

tests/unit/retry/test_retry_unary.py

@@ -14,8 +14,8 @@
 
 import datetime
 import re
+from unittest import mock
 
-import mock
 import pytest
 
 from google.api_core import exceptions

tests/unit/test_bidi.py

@@ -16,8 +16,8 @@
 import logging
 import queue
 import threading
+from unittest import mock
 
-import mock
 import pytest
 
 try:

tests/unit/test_exceptions.py

@@ -14,8 +14,8 @@
 
 import http.client
 import json
+from unittest import mock
 
-import mock
 import pytest
 import requests
 

tests/unit/test_extended_operation.py

@@ -15,8 +15,8 @@
 import dataclasses
 import enum
 import typing
+from unittest import mock
 
-import mock
 import pytest
 
 from google.api_core import exceptions

tests/unit/test_grpc_helpers.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
 
 try:

tests/unit/test_operation.py

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from unittest import mock
 
-import mock
 import pytest
 
 try:

tests/unit/test_page_iterator.py

@@ -14,8 +14,8 @@
 
 import math
 import types
+from unittest import mock
 
-import mock
 import pytest
 
 from google.api_core import page_iterator

tests/unit/test_path_template.py

@@ -12,9 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import unicode_literals
+from unittest import mock
 
-import mock
 import pytest
 
 from google.api import auth_pb2

tests/unit/test_timeout.py

@@ -14,8 +14,7 @@
 
 import datetime
 import itertools
-
-import mock
+from unittest import mock
 
 from google.api_core import timeout as timeouts