Skip to content

Commit 7230a99

Browse files
spookylukeyspookylukey
committed
Moved contrib.csrf.* to core code.
There is stub code for backwards compatiblity with Django 1.1 imports. The documentation has been updated, but has been left in docs/contrib/csrf.txt for now, in order to avoid dead links to documentation on the website. git-svn-id: http://code.djangoproject.com/svn/django/trunk@11661 bcc190cf-cafb-0310-a4f2-bffc1f526a37
1 parent 8e70cef commit 7230a99

File tree

26 files changed

+394
-355
lines changed

26 files changed

+394
-355
lines changed

‎django/conf/global_settings.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@
300300
MIDDLEWARE_CLASSES = (
301301
'django.middleware.common.CommonMiddleware',
302302
'django.contrib.sessions.middleware.SessionMiddleware',
303-
'django.contrib.csrf.middleware.CsrfViewMiddleware',
303+
'django.middleware.csrf.CsrfViewMiddleware',
304304
'django.contrib.auth.middleware.AuthenticationMiddleware',
305305
# 'django.middleware.http.ConditionalGetMiddleware',
306306
# 'django.middleware.gzip.GZipMiddleware',
@@ -381,7 +381,7 @@
381381

382382
# Dotted path to callable to be used as view when a request is
383383
# rejected by the CSRF middleware.
384-
CSRF_FAILURE_VIEW = 'django.contrib.csrf.views.csrf_failure'
384+
CSRF_FAILURE_VIEW = 'django.views.csrf.csrf_failure'
385385

386386
# Name and domain for CSRF cookie.
387387
CSRF_COOKIE_NAME = 'csrftoken'

‎django/conf/project_template/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
MIDDLEWARE_CLASSES = (
6161
'django.middleware.common.CommonMiddleware',
6262
'django.contrib.sessions.middleware.SessionMiddleware',
63-
'django.contrib.csrf.middleware.CsrfViewMiddleware',
63+
'django.middleware.csrf.CsrfViewMiddleware',
6464
'django.contrib.auth.middleware.AuthenticationMiddleware',
6565
)
6666

‎django/contrib/admin/options.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from django.contrib.admin import widgets
77
from django.contrib.admin import helpers
88
from django.contrib.admin.util import unquote, flatten_fieldsets, get_deleted_objects, model_ngettext, model_format_dict
9-
from django.contrib.csrf.decorators import csrf_protect
9+
from django.views.decorators.csrf import csrf_protect
1010
from django.core.exceptions import PermissionDenied
1111
from django.db import models, transaction
1212
from django.db.models.fields import BLANK_CHOICE_DASH

‎django/contrib/admin/sites.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
from django.contrib.admin import ModelAdmin
44
from django.contrib.admin import actions
55
from django.contrib.auth import authenticate, login
6-
from django.contrib.csrf.middleware import csrf_response_exempt
7-
from django.contrib.csrf.decorators import csrf_protect
6+
from django.views.decorators.csrf import csrf_protect, csrf_response_exempt
87
from django.db.models.base import ModelBase
98
from django.core.exceptions import ImproperlyConfigured
109
from django.core.urlresolvers import reverse

‎django/contrib/auth/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from django.contrib.auth.forms import AuthenticationForm
55
from django.contrib.auth.forms import PasswordResetForm, SetPasswordForm, PasswordChangeForm
66
from django.contrib.auth.tokens import default_token_generator
7-
from django.contrib.csrf.decorators import csrf_protect
7+
from django.views.decorators.csrf import csrf_protect
88
from django.core.urlresolvers import reverse
99
from django.shortcuts import render_to_response, get_object_or_404
1010
from django.contrib.sites.models import Site, RequestSite

‎django/contrib/comments/views/comments.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from django.views.decorators.http import require_POST
1111
from django.contrib import comments
1212
from django.contrib.comments import signals
13-
from django.contrib.csrf.decorators import csrf_protect
13+
from django.views.decorators.csrf import csrf_protect
1414

1515
class CommentPostBadRequest(http.HttpResponseBadRequest):
1616
"""

‎django/contrib/comments/views/moderation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from utils import next_redirect, confirmation_view
66
from django.contrib import comments
77
from django.contrib.comments import signals
8-
from django.contrib.csrf.decorators import csrf_protect
8+
from django.views.decorators.csrf import csrf_protect
99

1010
@csrf_protect
1111
@login_required

‎django/contrib/csrf/context_processors.py

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎django/contrib/csrf/decorators.py

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)