From b5cb93eb24db9205b3739302df15ed12402bb413 Mon Sep 17 00:00:00 2001 From: Alexandre Detiste Date: Wed, 10 Apr 2024 00:18:23 +0200 Subject: [PATCH] prefer new unittest.mock everywhere --- tests_app/tests/unit/cache/decorators/tests.py | 5 ++++- tests_app/tests/unit/key_constructor/bits/tests.py | 6 ++++-- tests_app/tests/unit/key_constructor/constructor/tests.py | 5 ++++- tests_app/testutils.py | 5 ++++- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/tests_app/tests/unit/cache/decorators/tests.py b/tests_app/tests/unit/cache/decorators/tests.py index 2a50db2..b9b7000 100644 --- a/tests_app/tests/unit/cache/decorators/tests.py +++ b/tests_app/tests/unit/cache/decorators/tests.py @@ -1,6 +1,9 @@ from django.core.cache import caches from django.test import TestCase -from mock import Mock, patch +try: + from unittest.mock import Mock, patch +except ImportError: + from mock import Mock, patch from rest_framework import views from rest_framework.response import Response diff --git a/tests_app/tests/unit/key_constructor/bits/tests.py b/tests_app/tests/unit/key_constructor/bits/tests.py index fbc47cb..2319df2 100644 --- a/tests_app/tests/unit/key_constructor/bits/tests.py +++ b/tests_app/tests/unit/key_constructor/bits/tests.py @@ -1,5 +1,7 @@ -from mock import Mock -from mock import PropertyMock +try: + from unittest.mock import Mock, PropertyMock +except ImportError: + from mock import Mock, PropertyMock import django from django.test import TestCase diff --git a/tests_app/tests/unit/key_constructor/constructor/tests.py b/tests_app/tests/unit/key_constructor/constructor/tests.py index 671f6db..75f4a71 100644 --- a/tests_app/tests/unit/key_constructor/constructor/tests.py +++ b/tests_app/tests/unit/key_constructor/constructor/tests.py @@ -1,7 +1,10 @@ from copy import deepcopy import hashlib import json -from mock import Mock, patch +try: + from unittest.mock import Mock, patch +except ImportError: + from mock import Mock, patch from django.test import TestCase diff --git a/tests_app/testutils.py b/tests_app/testutils.py index dafb756..fccb453 100644 --- a/tests_app/testutils.py +++ b/tests_app/testutils.py @@ -1,5 +1,8 @@ import base64 -from mock import patch +try: + from unittest.mock import patch +except ImportError: + from mock import patch from rest_framework import HTTP_HEADER_ENCODING