From 3bc14174101c3510aeb48034da17a2504308b932 Mon Sep 17 00:00:00 2001 From: Major Hayden Date: Thu, 19 May 2022 09:08:48 -0500 Subject: [PATCH] fix: Use unittest.mock if available The `mock` module is deprecated in recent Python versions. Signed-off-by: Major Hayden --- tests/system/requests/test_upload.py | 5 ++++- tests/unit/requests/test__helpers.py | 5 ++++- tests/unit/requests/test_download.py | 5 ++++- tests/unit/requests/test_upload.py | 5 ++++- tests/unit/test__download.py | 5 ++++- tests/unit/test__helpers.py | 5 ++++- tests/unit/test__upload.py | 5 ++++- tests/unit/test_common.py | 5 ++++- 8 files changed, 32 insertions(+), 8 deletions(-) diff --git a/tests/system/requests/test_upload.py b/tests/system/requests/test_upload.py index 3dc92077..722d4928 100644 --- a/tests/system/requests/test_upload.py +++ b/tests/system/requests/test_upload.py @@ -20,7 +20,10 @@ import urllib.parse import pytest # type: ignore -import mock +try: + from unittest import mock +except ImportError: + import mock from google.resumable_media import common from google import resumable_media diff --git a/tests/unit/requests/test__helpers.py b/tests/unit/requests/test__helpers.py index 0d4c7d17..592ea2c4 100644 --- a/tests/unit/requests/test__helpers.py +++ b/tests/unit/requests/test__helpers.py @@ -14,7 +14,10 @@ import http.client -import mock +try: + from unittest import mock +except ImportError: + import mock import pytest # type: ignore import requests.exceptions diff --git a/tests/unit/requests/test_download.py b/tests/unit/requests/test_download.py index 210973d7..63f970ac 100644 --- a/tests/unit/requests/test_download.py +++ b/tests/unit/requests/test_download.py @@ -15,7 +15,10 @@ import http.client import io -import mock +try: + from unittest import mock +except ImportError: + import mock import pytest # type: ignore from google.resumable_media import common diff --git a/tests/unit/requests/test_upload.py b/tests/unit/requests/test_upload.py index 3694c750..825e610e 100644 --- a/tests/unit/requests/test_upload.py +++ b/tests/unit/requests/test_upload.py @@ -16,7 +16,10 @@ import io import json -import mock +try: + from unittest import mock +except ImportError: + import mock import google.resumable_media.requests.upload as upload_mod diff --git a/tests/unit/test__download.py b/tests/unit/test__download.py index 46026b16..0b051746 100644 --- a/tests/unit/test__download.py +++ b/tests/unit/test__download.py @@ -15,7 +15,10 @@ import http.client import io -import mock +try: + from unittest import mock +except ImportError: + import mock import pytest # type: ignore from google.resumable_media import _download diff --git a/tests/unit/test__helpers.py b/tests/unit/test__helpers.py index feedeb18..3e28f6ae 100644 --- a/tests/unit/test__helpers.py +++ b/tests/unit/test__helpers.py @@ -17,7 +17,10 @@ import hashlib import http.client -import mock +try: + from unittest import mock +except ImportError: + import mock import pytest # type: ignore from google.resumable_media import _helpers diff --git a/tests/unit/test__upload.py b/tests/unit/test__upload.py index d5f82089..4d88439c 100644 --- a/tests/unit/test__upload.py +++ b/tests/unit/test__upload.py @@ -16,7 +16,10 @@ import io import sys -import mock +try: + from unittest import mock +except ImportError: + import mock import pytest # type: ignore from google.resumable_media import _helpers diff --git a/tests/unit/test_common.py b/tests/unit/test_common.py index a8572bea..97759927 100644 --- a/tests/unit/test_common.py +++ b/tests/unit/test_common.py @@ -12,7 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +try: + from unittest import mock +except ImportError: + import mock import pytest # type: ignore from google.resumable_media import common