diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index 6d9b2bc11e..3e9318dfce 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -219,12 +219,12 @@ TRANSACTIONS_MANAGED = False # this middleware classes will be applied in the order given, and in the # response phase the middleware will be applied in reverse order. MIDDLEWARE_CLASSES = ( - "django.contrib.sessions.middleware.SessionMiddleware", - "django.contrib.auth.middleware.AuthenticationMiddleware", -# "django.middleware.http.ConditionalGetMiddleware", -# "django.middleware.gzip.GZipMiddleware", - "django.middleware.common.CommonMiddleware", - "django.middleware.doc.XViewMiddleware", + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', +# 'django.middleware.http.ConditionalGetMiddleware', +# 'django.middleware.gzip.GZipMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.doc.XViewMiddleware', ) ############ diff --git a/django/conf/project_template/settings.py b/django/conf/project_template/settings.py index 800d1023d9..14da715db5 100644 --- a/django/conf/project_template/settings.py +++ b/django/conf/project_template/settings.py @@ -51,10 +51,10 @@ TEMPLATE_LOADERS = ( ) MIDDLEWARE_CLASSES = ( - "django.middleware.common.CommonMiddleware", - "django.contrib.sessions.middleware.SessionMiddleware", - "django.contrib.auth.middleware.AuthenticationMiddleware", - "django.middleware.doc.XViewMiddleware", + 'django.middleware.common.CommonMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.middleware.doc.XViewMiddleware', ) ROOT_URLCONF = '{{ project_name }}.urls' diff --git a/docs/cache.txt b/docs/cache.txt index 2c54f60456..2ef3d6503f 100644 --- a/docs/cache.txt +++ b/docs/cache.txt @@ -209,12 +209,12 @@ The per-site cache ================== Once the cache is set up, the simplest way to use caching is to cache your -entire site. Just add ``django.middleware.cache.CacheMiddleware`` to your +entire site. Just add ``'django.middleware.cache.CacheMiddleware'`` to your ``MIDDLEWARE_CLASSES`` setting, as in this example:: MIDDLEWARE_CLASSES = ( - "django.middleware.cache.CacheMiddleware", - "django.middleware.common.CommonMiddleware", + 'django.middleware.cache.CacheMiddleware', + 'django.middleware.common.CommonMiddleware', ) (The order of ``MIDDLEWARE_CLASSES`` matters. See "Order of MIDDLEWARE_CLASSES" diff --git a/docs/csrf.txt b/docs/csrf.txt index 4ea09552fc..218b43a61a 100644 --- a/docs/csrf.txt +++ b/docs/csrf.txt @@ -17,7 +17,7 @@ middleware into your list of installed middleware. How to use it ============= -Add the middleware ``"django.contrib.csrf.middleware.CsrfMiddleware"`` to +Add the middleware ``'django.contrib.csrf.middleware.CsrfMiddleware'`` to your list of middleware classes, ``MIDDLEWARE_CLASSES``. It needs to process the response after the SessionMiddleware, so must come before it in the list. It also must process the response before things like compression diff --git a/docs/middleware.txt b/docs/middleware.txt index f3dbcb82d1..bad00fd890 100644 --- a/docs/middleware.txt +++ b/docs/middleware.txt @@ -23,10 +23,10 @@ name. For example, here's the default ``MIDDLEWARE_CLASSES`` created by ``django-admin.py startproject``:: MIDDLEWARE_CLASSES = ( - "django.middleware.common.CommonMiddleware", - "django.contrib.sessions.middleware.SessionMiddleware", - "django.contrib.auth.middleware.AuthenticationMiddleware", - "django.middleware.doc.XViewMiddleware", + 'django.middleware.common.CommonMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.middleware.doc.XViewMiddleware', ) Django applies middleware in the order it's defined in ``MIDDLEWARE_CLASSES``, diff --git a/docs/sessions.txt b/docs/sessions.txt index 10d94cd4fd..b7f16b67b9 100644 --- a/docs/sessions.txt +++ b/docs/sessions.txt @@ -14,7 +14,7 @@ Sessions are implemented via middleware_. Turn session functionality on and off by editing the ``MIDDLEWARE_CLASSES`` setting. To activate sessions, make sure ``MIDDLEWARE_CLASSES`` contains -``"django.contrib.sessions.middleware.SessionMiddleware"``. +``'django.contrib.sessions.middleware.SessionMiddleware'``. The default ``settings.py`` created by ``django-admin.py startproject`` has ``SessionMiddleware`` activated. diff --git a/docs/transactions.txt b/docs/transactions.txt index 378aa959d1..c1cd5aa984 100644 --- a/docs/transactions.txt +++ b/docs/transactions.txt @@ -32,10 +32,10 @@ To activate this feature, just add the ``TransactionMiddleware`` middleware to your ``MIDDLEWARE_CLASSES`` setting:: MIDDLEWARE_CLASSES = ( - "django.contrib.sessions.middleware.SessionMiddleware", - "django.middleware.common.CommonMiddleware", - "django.middleware.cache.CacheMiddleware", - "django.middleware.transaction.TransactionMiddleware", + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.cache.CacheMiddleware', + 'django.middleware.transaction.TransactionMiddleware', ) The order is quite important. The transaction middleware applies not only to