From 0ec5a547c949e9b52209717108c4e2ac475238e4 Mon Sep 17 00:00:00 2001
From: Joseph Kocherhans <joseph@jkocherhans.com>
Date: Tue, 7 Mar 2006 02:06:28 +0000
Subject: [PATCH] magic-removal: Moved django.views.auth.login.* to
django.contrib.auth.views
git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2496 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
django/conf/urls/registration.py | 6 +++---
django/contrib/admin/urls.py | 2 +-
django/{views/auth/login.py => contrib/auth/views.py} | 0
django/contrib/flatpages/views.py | 2 +-
django/views/auth/__init__.py | 0
django/views/decorators/auth.py | 4 ++--
django/views/generic/create_update.py | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
rename django/{views/auth/login.py => contrib/auth/views.py} (100%)
delete mode 100644 django/views/auth/__init__.py
diff --git a/django/conf/urls/registration.py b/django/conf/urls/registration.py
index 5a56fe5e05..be875f5e4d 100644
--- a/django/conf/urls/registration.py
+++ b/django/conf/urls/registration.py
@@ -1,9 +1,9 @@
from django.conf.urls.defaults import *
urlpatterns = patterns('',
- (r'^login/$', 'django.views.auth.login.login'),
- (r'^logout/$', 'django.views.auth.login.logout'),
- (r'^login_another/$', 'django.views.auth.login.logout_then_login'),
+ (r'^login/$', 'django.contrib.auth.view.login'),
+ (r'^logout/$', 'django.contrib.auth.views.logout'),
+ (r'^login_another/$', 'django.contrib.auth.views.logout_then_login'),
(r'^register/$', 'ellington.registration.views.registration.signup'),
(r'^register/(?P<challenge_string>\w{32})/$', 'ellington.registration.views.registration.register_form'),
diff --git a/django/contrib/admin/urls.py b/django/contrib/admin/urls.py
index 831697d290..f7c47f2ae9 100644
--- a/django/contrib/admin/urls.py
+++ b/django/contrib/admin/urls.py
@@ -3,7 +3,7 @@ from django.conf.urls.defaults import *
urlpatterns = patterns('',
('^$', 'django.contrib.admin.views.main.index'),
('^jsi18n/$', 'django.views.i18n.javascript_catalog', {'packages': 'django.conf'}),
- ('^logout/$', 'django.views.auth.login.logout'),
+ ('^logout/$', 'django.contrib.auth.views.logout'),
('^password_change/$', 'django.views.registration.passwords.password_change'),
('^password_change/done/$', 'django.views.registration.passwords.password_change_done'),
('^template_validator/$', 'django.contrib.admin.views.template.template_validator'),
diff --git a/django/views/auth/login.py b/django/contrib/auth/views.py
similarity index 100%
rename from django/views/auth/login.py
rename to django/contrib/auth/views.py
diff --git a/django/contrib/flatpages/views.py b/django/contrib/flatpages/views.py
index fac4ab0c41..e9c6be011d 100644
--- a/django/contrib/flatpages/views.py
+++ b/django/contrib/flatpages/views.py
@@ -23,7 +23,7 @@ def flatpage(request, url):
# If registration is required for accessing this page, and the user isn't
# logged in, redirect to the login page.
if f.registration_required and request.user.is_anonymous():
- from django.views.auth.login import redirect_to_login
+ from django.contrib.auth.views import redirect_to_login
return redirect_to_login(request.path)
if f.template_name:
t = loader.select_template((f.template_name, DEFAULT_TEMPLATE))
diff --git a/django/views/auth/__init__.py b/django/views/auth/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/django/views/decorators/auth.py b/django/views/decorators/auth.py
index 478f0ac84d..536c00edc0 100644
--- a/django/views/decorators/auth.py
+++ b/django/views/decorators/auth.py
@@ -1,4 +1,4 @@
-from django.views.auth import login
+from django.contrib.auth.views import redirect_to_login
def user_passes_test(test_func, login_url=login.LOGIN_URL):
"""
@@ -10,7 +10,7 @@ def user_passes_test(test_func, login_url=login.LOGIN_URL):
def _checklogin(request, *args, **kwargs):
if test_func(request.user):
return view_func(request, *args, **kwargs)
- return login.redirect_to_login(request.path, login_url)
+ return redirect_to_login(request.path, login_url)
return _checklogin
return _dec
diff --git a/django/views/generic/create_update.py b/django/views/generic/create_update.py
index 2d260c5cf7..dc21427196 100644
--- a/django/views/generic/create_update.py
+++ b/django/views/generic/create_update.py
@@ -2,7 +2,7 @@ from django.core.xheaders import populate_xheaders
from django.template import loader
from django import forms
from django.db.models import FileField
-from django.views.auth.login import redirect_to_login
+from django.contrib.auth.views import redirect_to_login
from django.template import RequestContext
from django.core.paginator import ObjectPaginator, InvalidPage
from django.http import Http404, HttpResponse, HttpResponseRedirect