Fix tests for modern Django and Python

Author: blag

Makefile

@@ -7,7 +7,7 @@ ruff:
 
 example:
 	DJANGO_SETTINGS_MODULE=example.settings PYTHONPATH=. \
-		django-admin.py runserver
+		django-admin runserver
 
 check:
 	DJANGO_SETTINGS_MODULE=example.settings PYTHONPATH=. \
@@ -19,11 +19,11 @@ generate-mmdb-fixtures:
 
 test: generate-mmdb-fixtures
 	DJANGO_SETTINGS_MODULE=tests.settings PYTHONPATH=. \
-		django-admin.py test ${TARGET}
+		django-admin test ${TARGET}
 
 migrations:
 	DJANGO_SETTINGS_MODULE=tests.settings PYTHONPATH=. \
-		django-admin.py makemigrations user_sessions
+		django-admin makemigrations user_sessions
 
 coverage:
 	coverage erase
@@ -34,8 +34,8 @@ coverage:
 
 tx-pull:
 	tx pull -a
-	cd user_sessions; django-admin.py compilemessages
+	cd user_sessions; django-admin compilemessages
 
 tx-push:
-	cd user_sessions; django-admin.py makemessages -l en
+	cd user_sessions; django-admin makemessages -l en
 	tx push -s

pyproject.toml

@@ -12,22 +12,22 @@ requires-python = ">=3.8"
 keywords = ["django", "sessions"]
 license = {text = "MIT"}
 classifiers = [
-  "Development Status :: 5 - Production/Stable",
-  "Environment :: Web Environment",
-  "Framework :: Django",
-  "Framework :: Django :: 3.2",
-  "Framework :: Django :: 4.2",
-  "Intended Audience :: Developers",
-  "License :: OSI Approved :: MIT License",
-  "Operating System :: OS Independent",
-  "Programming Language :: Python",
-  "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.8",
-  "Programming Language :: Python :: 3.9",
-  "Programming Language :: Python :: 3.10",
-  "Programming Language :: Python :: 3.11",
-  "Programming Language :: Python :: 3.12",
-  "Topic :: Security",
+    "Development Status :: 5 - Production/Stable",
+    "Environment :: Web Environment",
+    "Framework :: Django",
+    "Framework :: Django :: 3.2",
+    "Framework :: Django :: 4.2",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Topic :: Security",
 ]
 dependencies = [
     "Django>=3.2",
@@ -43,21 +43,21 @@ issues = "https://github.com/jazzband/django-user-sessions/issues"
 
 [project.optional-dependencies]
 dev = [
-  # Example app
-  "django-debug-toolbar",
-  # Testing
-  "coverage",
-  "tox",
-  "tox-pyenv",
-  "detox",
-  # Transifex
-  "transifex-client",
-  # Documentation
-  "Sphinx",
-  "sphinx_rtd_theme",
-  # Build
-  "bumpversion",
-  "twine",
+    # Example app
+    "django-debug-toolbar",
+    # Testing
+    "coverage",
+    "tox",
+    "tox-pyenv",
+    "detox",
+    # Transifex
+    "transifex-client",
+    # Documentation
+    "Sphinx",
+    "sphinx_rtd_theme",
+    # Build
+    "bumpversion",
+    "twine",
 ]
 
 [tool.ruff]

tests/test_admin.py

@@ -25,37 +25,32 @@ def setUp(self):
         self.admin_url = reverse('admin:user_sessions_session_changelist')
 
     def test_list(self):
-        with self.assertWarnsRegex(UserWarning, r"The address 1\.1\.1\.1 is not in the database"):
-            response = self.client.get(self.admin_url)
+        response = self.client.get(self.admin_url)
         self.assertContains(response, 'Select session to change')
         self.assertContains(response, '127.0.0.1')
         self.assertContains(response, '20.13.1.1')
         self.assertContains(response, '1.1.1.1')
 
     def test_search(self):
-        with self.assertWarnsRegex(UserWarning, r"The address 127\.0\.0\.1 is not in the database"):
-            response = self.client.get(self.admin_url, {'q': 'bouke'})
+        response = self.client.get(self.admin_url, {'q': 'bouke'})
         self.assertContains(response, '127.0.0.1')
         self.assertNotContains(response, '20.13.1.1')
         self.assertNotContains(response, '1.1.1.1')
 
     def test_mine(self):
         my_sessions = f"{self.admin_url}?{urlencode({'owner': 'my'})}"
-        with self.assertWarnsRegex(UserWarning, r"The address 127\.0\.0\.1 is not in the database"):
-            response = self.client.get(my_sessions)
+        response = self.client.get(my_sessions)
         self.assertContains(response, '127.0.0.1')
         self.assertNotContains(response, '1.1.1.1')
 
     def test_expired(self):
         expired = f"{self.admin_url}?{urlencode({'active': '0'})}"
-        with self.assertWarnsRegex(UserWarning, r"The address 20\.13\.1\.1 is not in the database"):
-            response = self.client.get(expired)
+        response = self.client.get(expired)
         self.assertContains(response, '20.13.1.1')
         self.assertNotContains(response, '1.1.1.1')
 
     def test_unexpired(self):
         unexpired = f"{self.admin_url}?{urlencode({'active': '1'})}"
-        with self.assertWarnsRegex(UserWarning, r"The address 1\.1\.1\.1 is not in the database"):
-            response = self.client.get(unexpired)
+        response = self.client.get(unexpired)
         self.assertContains(response, '1.1.1.1')
         self.assertNotContains(response, '20.13.1.1')

tests/test_template_filters.py

@@ -25,12 +25,7 @@
 class LocationTemplateFilterTest(TestCase):
     @override_settings(GEOIP_PATH=None)
     def test_no_location(self):
-        with self.assertWarnsRegex(
-            UserWarning,
-            r"The address 127\.0\.0\.1 is not in the database",
-        ):
-            loc = location('127.0.0.1')
-        self.assertEqual(loc, None)
+        self.assertIsNone(location('127.0.0.1'))
 
     @skipUnless(geoip, geoip_msg)
     def test_city(self):

tests/test_views.py

@@ -20,8 +20,7 @@ def test_list(self):
         self.user.session_set.create(session_key='ABC123', ip='127.0.0.1',
                                      expire_date=now() + timedelta(days=1),
                                      user_agent='Firefox')
-        with self.assertWarnsRegex(UserWarning, r"The address 127\.0\.0\.1 is not in the database"):
-            response = self.client.get(reverse('user_sessions:session_list'))
+        response = self.client.get(reverse('user_sessions:session_list'))
         self.assertContains(response, 'Active Sessions')
         self.assertContains(response, 'Firefox')
         self.assertNotContains(response, 'ABC123')
@@ -36,8 +35,7 @@ def test_delete_all_other(self):
         self.user.session_set.create(ip='127.0.0.1', expire_date=now() + timedelta(days=1))
         self.assertEqual(self.user.session_set.count(), 2)
         response = self.client.post(reverse('user_sessions:session_delete_other'))
-        with self.assertWarnsRegex(UserWarning, r"The address 127\.0\.0\.1 is not in the database"):
-            self.assertRedirects(response, reverse('user_sessions:session_list'))
+        self.assertRedirects(response, reverse('user_sessions:session_list'))
         self.assertEqual(self.user.session_set.count(), 1)
 
     def test_delete_some_other(self):
@@ -46,6 +44,5 @@ def test_delete_some_other(self):
         self.assertEqual(self.user.session_set.count(), 2)
         response = self.client.post(reverse('user_sessions:session_delete',
                                             args=[other.session_key]))
-        with self.assertWarnsRegex(UserWarning, r"The address 127\.0\.0\.1 is not in the database"):
-            self.assertRedirects(response, reverse('user_sessions:session_list'))
+        self.assertRedirects(response, reverse('user_sessions:session_list'))
         self.assertEqual(self.user.session_set.count(), 1)