simplified imports

Author: daniel-sanche

setup.py

@@ -76,8 +76,7 @@
     # TODO(https://github.com/googleapis/google-auth-library-python/issues/1722): `test_aiohttp_requests` depend on
     # aiohttp < 3.10.0 which is a bug. Investigate and remove the pinned aiohttp version.
     "aiohttp < 3.10.0",
-    "mock; python_version < '3.8'",
-    "asyncmock; python_version < '3.8'",
+    "mock >= 4.0.0; python_version < '3.8'",
     "freezegun",
 ]
 

tests/test__exponential_backoff.py

@@ -18,11 +18,7 @@
     from unittest.mock import AsyncMock
 else:
     import mock
-
-    try:
-        from mock import AsyncMock
-    except ImportError:
-        from asyncmock import AsyncMock
+    from mock import AsyncMock
 
 import pytest  # type: ignore
 

tests/transport/aio/test_aiohttp.py

@@ -13,12 +13,13 @@
 # limitations under the License.
 
 import asyncio
-from unittest.mock import Mock, patch
-try:
-    from unittest.mock import AsyncMock
-except ImportError:
-    # Fallback for Python < 3.8
+import sys
+if sys.version_info >= (3, 8):
+    from unittest.mock import Mock, patch, AsyncMock
+else:
+    from unittest.mock import Mock, patch
     from mock import AsyncMock
+
 from aioresponses import aioresponses  # type: ignore
 import pytest  # type: ignore
 import pytest_asyncio  # type: ignore

tests_async/oauth2/test__client_async.py

@@ -23,11 +23,7 @@
     from unittest.mock import AsyncMock
 else:
     import mock
-
-    try:
-        from mock import AsyncMock
-    except ImportError:
-        from asyncmock import AsyncMock
+    from mock import AsyncMock
 
 import freezegun
 import pytest  # type: ignore

tests_async/oauth2/test_credentials_async.py

@@ -22,10 +22,7 @@
     from unittest.mock import AsyncMock
 else:
     import mock
-    try:
-        from mock import AsyncMock
-    except ImportError:
-        from asyncmock import AsyncMock
+    from mock import AsyncMock
 
 import pytest  # type: ignore
 

tests_async/oauth2/test_reauth_async.py

@@ -13,11 +13,12 @@
 # limitations under the License.
 
 import copy
-from unittest import mock
-try:
+import sys
+if sys.version_info >= (3, 8):
+    from unittest import mock
     from unittest.mock import AsyncMock
-except ImportError:
-    # Fallback for Python < 3.8
+else:
+    import mock
     from mock import AsyncMock
 
 import pytest  # type: ignore

tests_async/oauth2/test_service_account_async.py

@@ -19,10 +19,7 @@
     from unittest.mock import AsyncMock
 else:
     import mock
-    try:
-        from mock import AsyncMock
-    except ImportError:
-        from asyncmock import AsyncMock
+    from mock import AsyncMock
 
 import pytest  # type: ignore
 

tests_async/transport/test_aiohttp_requests.py

@@ -18,11 +18,7 @@
     from unittest.mock import AsyncMock
 else:
     import mock
-
-    try:
-        from mock import AsyncMock
-    except ImportError:
-        from asyncmock import AsyncMock
+    from mock import AsyncMock
 
 import aiohttp  # type: ignore
 from aioresponses import aioresponses, core  # type: ignore