summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--django/contrib/auth/admin.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/contrib/auth/admin.py b/django/contrib/auth/admin.py
index 963600688e..aba2220248 100644
--- a/django/contrib/auth/admin.py
+++ b/django/contrib/auth/admin.py
@@ -1,4 +1,3 @@
-from django.contrib.auth.forms import UserCreationForm
from django.contrib.auth.models import User, Group
from django.core.exceptions import PermissionDenied
from django import oldforms, template
@@ -25,6 +24,8 @@ class UserAdmin(admin.ModelAdmin):
filter_horizontal = ('user_permissions',)
def add_view(self, request):
+ # avoid a circular import. see #6718.
+ from django.contrib.auth.forms import UserCreationForm
if not self.has_change_permission(request):
raise PermissionDenied
if request.method == 'POST':