Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

newforms-admin: Fixed #6718 -- Removed a circular import in contrib/a…

…uth/admin.py. Thanks Eric B.

git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7671 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 608af1f9d7cb51dfbf89264e7df9e014313f3d06 1 parent dfe06aa
Brian Rosner authored June 16, 2008

Showing 1 changed file with 2 additions and 1 deletion. Show diff stats Hide diff stats

  1. 3  django/contrib/auth/admin.py
3  django/contrib/auth/admin.py
... ...
@@ -1,4 +1,3 @@
1  
-from django.contrib.auth.forms import UserCreationForm
2 1
 from django.contrib.auth.models import User, Group
3 2
 from django.core.exceptions import PermissionDenied
4 3
 from django import oldforms, template
@@ -25,6 +24,8 @@ class UserAdmin(admin.ModelAdmin):
25 24
     filter_horizontal = ('user_permissions',)
26 25
 
27 26
     def add_view(self, request):
  27
+        # avoid a circular import. see #6718.
  28
+        from django.contrib.auth.forms import UserCreationForm
28 29
         if not self.has_change_permission(request):
29 30
             raise PermissionDenied
30 31
         if request.method == 'POST':

0 notes on commit 608af1f

Please sign in to comment.
Something went wrong with that request. Please try again.