From 608af1f9d7cb51dfbf89264e7df9e014313f3d06 Mon Sep 17 00:00:00 2001 From: Brian Rosner Date: Mon, 16 Jun 2008 22:39:35 +0000 Subject: [PATCH] newforms-admin: Fixed #6718 -- Removed a circular import in contrib/auth/admin.py. Thanks Eric B. git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7671 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/auth/admin.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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':