From 99577ee090f20b0341d659528fc43f391cb3ce93 Mon Sep 17 00:00:00 2001 From: Alexandre Detiste Date: Thu, 23 May 2024 22:52:45 +0200 Subject: [PATCH] prefer unittest.mock from the standard library for Python >=3.8 --- tests/unit/http/test_async_http_client.py | 6 +++++- tests/unit/http/test_http_client.py | 6 +++++- tests/unit/http/test_validation_client.py | 6 +++++- tests/unit/jwt/test_jwt.py | 6 +++++- tests/unit/rest/test_client.py | 6 +++++- 5 files changed, 25 insertions(+), 5 deletions(-) diff --git a/tests/unit/http/test_async_http_client.py b/tests/unit/http/test_async_http_client.py index df43606843..3bdfc4d812 100644 --- a/tests/unit/http/test_async_http_client.py +++ b/tests/unit/http/test_async_http_client.py @@ -1,7 +1,11 @@ import aiounittest from aiohttp import ClientSession -from mock import patch, AsyncMock +try: + from unittest.mock import patch, AsyncMock +except ImportError: + # Python 3.7 + from mock import patch, AsyncMock from twilio.http.async_http_client import AsyncTwilioHttpClient diff --git a/tests/unit/http/test_http_client.py b/tests/unit/http/test_http_client.py index 8484e57b17..2fcbbc4efd 100644 --- a/tests/unit/http/test_http_client.py +++ b/tests/unit/http/test_http_client.py @@ -3,7 +3,11 @@ import unittest from collections import OrderedDict -from mock import Mock, patch +try: + from unittest.mock import Mock, patch +except ImportError: + # Python 3.7 + from mock import Mock, patch from requests import Session from twilio.base.exceptions import TwilioRestException diff --git a/tests/unit/http/test_validation_client.py b/tests/unit/http/test_validation_client.py index 5fdd4cb9fc..05473579ff 100644 --- a/tests/unit/http/test_validation_client.py +++ b/tests/unit/http/test_validation_client.py @@ -2,7 +2,11 @@ import unittest -from mock import patch, Mock +try: + from unittest.mock import patch, Mock +except ImportError: + # Python 3.7 + from mock import patch, Mock from requests import Request from requests import Session diff --git a/tests/unit/jwt/test_jwt.py b/tests/unit/jwt/test_jwt.py index 2f5aba62d7..2cc0f9257c 100644 --- a/tests/unit/jwt/test_jwt.py +++ b/tests/unit/jwt/test_jwt.py @@ -2,7 +2,11 @@ import unittest import jwt as jwt_lib -from mock import patch +try: + from unittest.mock import patch +except ImportError: + # Python 3.7 + from mock import patch from twilio.jwt import Jwt, JwtDecodeError diff --git a/tests/unit/rest/test_client.py b/tests/unit/rest/test_client.py index 9623dc52ad..066f1fafd2 100644 --- a/tests/unit/rest/test_client.py +++ b/tests/unit/rest/test_client.py @@ -1,7 +1,11 @@ import unittest import aiounittest -from mock import AsyncMock, Mock +try: + from unittest.mock import AsyncMock, Mock +except ImportError: + # Python 3.7 + from mock import AsyncMock, Mock from twilio.http.response import Response from twilio.rest import Client