From ca4aaca109859769fddd22df47f6b9f950a44642 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Sun, 8 Jan 2006 18:28:38 +0000 Subject: [PATCH] magic-removal: Moved session middleware from django/middleware/sessions.py to django/contrib/sessions/middleware.py git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@1866 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- .../sessions.py => contrib/sessions/middleware.py} | 0 docs/middleware.txt | 6 +++--- docs/sessions.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename django/{middleware/sessions.py => contrib/sessions/middleware.py} (100%) diff --git a/django/middleware/sessions.py b/django/contrib/sessions/middleware.py similarity index 100% rename from django/middleware/sessions.py rename to django/contrib/sessions/middleware.py diff --git a/docs/middleware.txt b/docs/middleware.txt index b55d8a1696..d46960a1d2 100644 --- a/docs/middleware.txt +++ b/docs/middleware.txt @@ -95,7 +95,7 @@ Handles conditional GET operations. If the response has a ``ETag`` or Also removes the content from any response to a HEAD request and sets the ``Date`` and ``Content-Length`` response-headers. -django.middleware.sessions.SessionMiddleware +django.contrib.sessions.middleware.SessionMiddleware -------------------------------------------- Enables session support. See the `session documentation`_. @@ -176,8 +176,8 @@ Guidelines to it. * Feel free to look at Django's available middleware for examples. The - default Django middleware classes are in ``django/middleware/`` in the - Django distribution. + core Django middleware classes are in ``django/middleware/`` in the + Django distribution. The session middleware is in ``django/contrib/sessions``. * If you write a middleware component that you think would be useful to other people, contribute to the community! Let us know, and we'll diff --git a/docs/sessions.txt b/docs/sessions.txt index 0d8b27b107..7c8abb9841 100644 --- a/docs/sessions.txt +++ b/docs/sessions.txt @@ -14,7 +14,7 @@ Session functionality is enabled by default. You can turn session functionality on and off by editing the ``MIDDLEWARE_CLASSES`` setting. To activate sessions, make sure -``MIDDLEWARE_CLASSES`` contains ``"django.middleware.sessions.SessionMiddleware"``. +``MIDDLEWARE_CLASSES`` contains ``"django.contrib.sessions.middleware.SessionMiddleware"``. If you don't want to use sessions, you might as well remove the ``SessionMiddleware`` line from ``MIDDLEWARE_CLASSES``. It'll save you a small