Commit 7230a995 authored by Luke Plant's avatar Luke Plant
Browse files

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
parent 8e70cef9

django/conf/global_settings.py

+2 −2
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ DEFAULT_INDEX_TABLESPACE = '' 
MIDDLEWARE_CLASSES = (

    'django.middleware.common.CommonMiddleware',

    'django.contrib.sessions.middleware.SessionMiddleware',

    'django.contrib.csrf.middleware.CsrfViewMiddleware',

    'django.middleware.csrf.CsrfViewMiddleware',

    'django.contrib.auth.middleware.AuthenticationMiddleware',

#     'django.middleware.http.ConditionalGetMiddleware',

#     'django.middleware.gzip.GZipMiddleware',
@@ -381,7 +381,7 @@ PASSWORD_RESET_TIMEOUT_DAYS = 3 


# Dotted path to callable to be used as view when a request is

# rejected by the CSRF middleware.

CSRF_FAILURE_VIEW = 'django.contrib.csrf.views.csrf_failure'

CSRF_FAILURE_VIEW = 'django.views.csrf.csrf_failure'



# Name and domain for CSRF cookie.

CSRF_COOKIE_NAME = 'csrftoken'

django/conf/project_template/settings.py

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ TEMPLATE_LOADERS = ( 
MIDDLEWARE_CLASSES = (

    'django.middleware.common.CommonMiddleware',

    'django.contrib.sessions.middleware.SessionMiddleware',

    'django.contrib.csrf.middleware.CsrfViewMiddleware',

    'django.middleware.csrf.CsrfViewMiddleware',

    'django.contrib.auth.middleware.AuthenticationMiddleware',

)

django/contrib/admin/options.py

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ from django.contrib.contenttypes.models import ContentType 
from django.contrib.admin import widgets

from django.contrib.admin import helpers

from django.contrib.admin.util import unquote, flatten_fieldsets, get_deleted_objects, model_ngettext, model_format_dict

from django.contrib.csrf.decorators import csrf_protect

from django.views.decorators.csrf import csrf_protect

from django.core.exceptions import PermissionDenied

from django.db import models, transaction

from django.db.models.fields import BLANK_CHOICE_DASH

django/contrib/admin/sites.py

+1 −2
Original line number Diff line number Diff line
@@ -3,8 +3,7 @@ from django import http, template 
from django.contrib.admin import ModelAdmin

from django.contrib.admin import actions

from django.contrib.auth import authenticate, login

from django.contrib.csrf.middleware import csrf_response_exempt

from django.contrib.csrf.decorators import csrf_protect

from django.views.decorators.csrf import csrf_protect, csrf_response_exempt

from django.db.models.base import ModelBase

from django.core.exceptions import ImproperlyConfigured

from django.core.urlresolvers import reverse

django/contrib/auth/views.py

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ from django.contrib.auth.decorators import login_required 
from django.contrib.auth.forms import AuthenticationForm

from django.contrib.auth.forms import PasswordResetForm, SetPasswordForm, PasswordChangeForm

from django.contrib.auth.tokens import default_token_generator

from django.contrib.csrf.decorators import csrf_protect

from django.views.decorators.csrf import csrf_protect

from django.core.urlresolvers import reverse

from django.shortcuts import render_to_response, get_object_or_404

from django.contrib.sites.models import Site, RequestSite