From 3bbe22dafcc69c5ffa79707f5a74eb1faf466e12 Mon Sep 17 00:00:00 2001
From: Mariusz Felisiak <felisiak.mariusz@gmail.com>
Date: Wed, 18 Jan 2023 09:46:01 +0100
Subject: Fixed #34233 -- Dropped support for Python 3.8 and 3.9.

---
 tests/utils_tests/test_autoreload.py     |  6 +-----
 tests/utils_tests/test_module_loading.py | 34 +++++---------------------------
 tests/utils_tests/test_timezone.py       |  6 +-----
 3 files changed, 7 insertions(+), 39 deletions(-)

(limited to 'tests/utils_tests')

diff --git a/tests/utils_tests/test_autoreload.py b/tests/utils_tests/test_autoreload.py
index b6286925b7..e33276ba61 100644
--- a/tests/utils_tests/test_autoreload.py
+++ b/tests/utils_tests/test_autoreload.py
@@ -9,16 +9,12 @@ import time
 import types
 import weakref
 import zipfile
+import zoneinfo
 from importlib import import_module
 from pathlib import Path
 from subprocess import CompletedProcess
 from unittest import mock, skip, skipIf
 
-try:
-    import zoneinfo
-except ImportError:
-    from backports import zoneinfo
-
 import django.__main__
 from django.apps.registry import Apps
 from django.test import SimpleTestCase
diff --git a/tests/utils_tests/test_module_loading.py b/tests/utils_tests/test_module_loading.py
index 736d456d2d..80ada3abd7 100644
--- a/tests/utils_tests/test_module_loading.py
+++ b/tests/utils_tests/test_module_loading.py
@@ -11,7 +11,6 @@ from django.utils.module_loading import (
     import_string,
     module_has_submodule,
 )
-from django.utils.version import PY310
 
 
 class DefaultLoader(unittest.TestCase):
@@ -205,35 +204,12 @@ class AutodiscoverModulesTestCase(SimpleTestCase):
         self.assertEqual(site._registry, {"lorem": "ipsum"})
 
 
-if PY310:
+class TestFinder:
+    def __init__(self, *args, **kwargs):
+        self.importer = zipimporter(*args, **kwargs)
 
-    class TestFinder:
-        def __init__(self, *args, **kwargs):
-            self.importer = zipimporter(*args, **kwargs)
-
-        def find_spec(self, path, target=None):
-            return self.importer.find_spec(path, target)
-
-else:
-
-    class TestFinder:
-        def __init__(self, *args, **kwargs):
-            self.importer = zipimporter(*args, **kwargs)
-
-        def find_module(self, path):
-            importer = self.importer.find_module(path)
-            if importer is None:
-                return
-            return TestLoader(importer)
-
-    class TestLoader:
-        def __init__(self, importer):
-            self.importer = importer
-
-        def load_module(self, name):
-            mod = self.importer.load_module(name)
-            mod.__loader__ = self
-            return mod
+    def find_spec(self, path, target=None):
+        return self.importer.find_spec(path, target)
 
 
 class CustomLoader(EggLoader):
diff --git a/tests/utils_tests/test_timezone.py b/tests/utils_tests/test_timezone.py
index 931347ad46..43bb2bc7a3 100644
--- a/tests/utils_tests/test_timezone.py
+++ b/tests/utils_tests/test_timezone.py
@@ -1,11 +1,7 @@
 import datetime
+import zoneinfo
 from unittest import mock
 
-try:
-    import zoneinfo
-except ImportError:
-    from backports import zoneinfo
-
 from django.test import SimpleTestCase, override_settings
 from django.utils import timezone
 
-- 
cgit v1.3