From 2584783f46922bcb456ceb9700a3726314df65d3 Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Fri, 7 Jul 2023 13:22:06 +0200 Subject: Refs #9602 -- Moved AlreadyRegistered/NotRegistered exceptions to django.contrib.admin.exceptions. --- tests/admin_registration/tests.py | 9 +++++---- tests/admin_views/test_autocomplete_view.py | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/admin_registration/tests.py b/tests/admin_registration/tests.py index c8caf3f202..3b0e656f5f 100644 --- a/tests/admin_registration/tests.py +++ b/tests/admin_registration/tests.py @@ -1,5 +1,6 @@ from django.contrib import admin from django.contrib.admin.decorators import register +from django.contrib.admin.exceptions import AlreadyRegistered, NotRegistered from django.contrib.admin.sites import site from django.core.exceptions import ImproperlyConfigured from django.test import SimpleTestCase @@ -35,7 +36,7 @@ class TestRegistration(SimpleTestCase): def test_prevent_double_registration(self): self.site.register(Person) msg = "The model Person is already registered in app 'admin_registration'." - with self.assertRaisesMessage(admin.sites.AlreadyRegistered, msg): + with self.assertRaisesMessage(AlreadyRegistered, msg): self.site.register(Person) def test_prevent_double_registration_for_custom_admin(self): @@ -47,12 +48,12 @@ class TestRegistration(SimpleTestCase): "The model Person is already registered with " "'admin_registration.PersonAdmin'." ) - with self.assertRaisesMessage(admin.sites.AlreadyRegistered, msg): + with self.assertRaisesMessage(AlreadyRegistered, msg): self.site.register(Person, PersonAdmin) def test_unregister_unregistered_model(self): msg = "The model Person is not registered" - with self.assertRaisesMessage(admin.sites.NotRegistered, msg): + with self.assertRaisesMessage(NotRegistered, msg): self.site.unregister(Person) def test_registration_with_star_star_options(self): @@ -61,7 +62,7 @@ class TestRegistration(SimpleTestCase): def test_get_model_admin_unregister_model(self): msg = "The model Person is not registered." - with self.assertRaisesMessage(admin.sites.NotRegistered, msg): + with self.assertRaisesMessage(NotRegistered, msg): self.site.get_model_admin(Person) def test_star_star_overrides(self): diff --git a/tests/admin_views/test_autocomplete_view.py b/tests/admin_views/test_autocomplete_view.py index f8ab32717a..968f160c8e 100644 --- a/tests/admin_views/test_autocomplete_view.py +++ b/tests/admin_views/test_autocomplete_view.py @@ -3,7 +3,7 @@ import json from contextlib import contextmanager from django.contrib import admin -from django.contrib.admin.sites import NotRegistered +from django.contrib.admin.exceptions import NotRegistered from django.contrib.admin.tests import AdminSeleniumTestCase from django.contrib.admin.views.autocomplete import AutocompleteJsonView from django.contrib.auth.models import Permission, User -- cgit v1.3