summaryrefslogtreecommitdiff
path: root/tests/admin_views
diff options
context:
space:
mode:
authorFrançois Freitag <mail@franek.fr>2020-02-12 14:48:49 +0100
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2020-04-28 10:49:00 +0200
commit9ef4a18dbe71f538a9ef8c39111ae2f0b62eb90b (patch)
tree0016b13a357af2f642483bdd168d6f83190f33bb /tests/admin_views
parent2788de95e375cccd03a3dfd161fc92b7d6df6024 (diff)
Changed django.forms.ValidationError imports to django.core.exceptions.ValidationError.
Co-Authored-By: Mariusz Felisiak <felisiak.mariusz@gmail.com>
Diffstat (limited to 'tests/admin_views')
-rw-r--r--tests/admin_views/admin.py2
-rw-r--r--tests/admin_views/custom_has_permission_admin.py4
-rw-r--r--tests/admin_views/forms.py4
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/admin_views/admin.py b/tests/admin_views/admin.py
index beec6f80f4..44623e483f 100644
--- a/tests/admin_views/admin.py
+++ b/tests/admin_views/admin.py
@@ -223,7 +223,7 @@ class BasePersonModelFormSet(BaseModelFormSet):
person = person_dict.get('id')
alive = person_dict.get('alive')
if person and alive and person.name == "Grace Hopper":
- raise forms.ValidationError("Grace is not a Zombie")
+ raise ValidationError("Grace is not a Zombie")
class PersonAdmin(admin.ModelAdmin):
diff --git a/tests/admin_views/custom_has_permission_admin.py b/tests/admin_views/custom_has_permission_admin.py
index 0c774ef573..354f6a2418 100644
--- a/tests/admin_views/custom_has_permission_admin.py
+++ b/tests/admin_views/custom_has_permission_admin.py
@@ -4,6 +4,7 @@ A custom AdminSite for AdminViewPermissionsTest.test_login_has_permission().
from django.contrib import admin
from django.contrib.auth import get_permission_codename
from django.contrib.auth.forms import AuthenticationForm
+from django.core.exceptions import ValidationError
from . import admin as base_admin, models
@@ -12,9 +13,8 @@ PERMISSION_NAME = 'admin_views.%s' % get_permission_codename('change', models.Ar
class PermissionAdminAuthenticationForm(AuthenticationForm):
def confirm_login_allowed(self, user):
- from django import forms
if not user.is_active or not (user.is_staff or user.has_perm(PERMISSION_NAME)):
- raise forms.ValidationError('permission denied')
+ raise ValidationError('permission denied')
class HasPermissionAdmin(admin.AdminSite):
diff --git a/tests/admin_views/forms.py b/tests/admin_views/forms.py
index cceb543c41..b25e49246a 100644
--- a/tests/admin_views/forms.py
+++ b/tests/admin_views/forms.py
@@ -1,6 +1,6 @@
-from django import forms
from django.contrib.admin.forms import AdminAuthenticationForm
from django.contrib.admin.helpers import ActionForm
+from django.core.exceptions import ValidationError
class CustomAdminAuthenticationForm(AdminAuthenticationForm):
@@ -11,7 +11,7 @@ class CustomAdminAuthenticationForm(AdminAuthenticationForm):
def clean_username(self):
username = self.cleaned_data.get('username')
if username == 'customform':
- raise forms.ValidationError('custom form error')
+ raise ValidationError('custom form error')
return username