Ticket #18978: 18978-1.diff

new file django/contrib/sessions/management/commands/cleansessions.py

@@ +1 @@
+from django.core.management.base import NoArgsCommand
+from django.utils import timezone
+
+
+class Command(NoArgsCommand):
+    help = "Clean expired sessions."
+
+    def handle_noargs(self, **options):
+        from django.db import transaction
+        from django.contrib.sessions.models import Session
+        Session.objects.filter(expire_date__lt=timezone.now()).delete()
+        transaction.commit_unless_managed()

django/core/management/commands/cleanup.py

@@ +1 @@
+from django.core import management
 from django.core.management.base import NoArgsCommand
-from django.utils import timezone
+
 
 class Command(NoArgsCommand):
     help = "Can be run as a cronjob or directly to clean out old data from the database (only expired sessions at the moment)."
 
     def handle_noargs(self, **options):
-        from django.db import transaction
-        from django.contrib.sessions.models import Session
-        Session.objects.filter(expire_date__lt=timezone.now()).delete()
-        transaction.commit_unless_managed()
+        management.call_command('cleansessions', **options)

docs/ref/django-admin.txt

@@ -1 +1 @@
 =============================
+
+
+.. 
 django-admin.py and manage.py
 =============================
 
@@ -93 +96 @@
 
 .. django-admin:: cleanup
 
-Can be run as a cronjob or directly to clean out old data from the database
-(only expired sessions at the moment).
+Can be run as a cronjob or directly to clean out old data from the database.
+Right now it only calls :djadmin:`cleansessions` management command from
+``django.contrib.sessions``.
+
+.. versionchanged:: 1.5
 
 compilemessages
 ---------------
@@ -1199 +1205 @@
 Please refer to its :djadmin:`description <ping_google>` in the Sitemaps
 documentation.
 
+``django.contrib.sessions``
+---------------------------
+
+cleansessions
+~~~~~~~~~~~~~
+
+This command is only available if the :doc:`Sessions </topics/http/sessions>`
+(``django.contrib.sessions``) are installed.
+
+Please refer to its :djadmin:`description <cleansessions>` in the Sessions
+documentation.
+
+.. versionadded:: 1.5
+
 ``django.contrib.staticfiles``
 ------------------------------
 

docs/releases/1.5.txt

@@ -486 +486 @@
 the :setting:`AUTH_PROFILE_MODULE` setting, and the
 :meth:`~django.contrib.auth.models.User.get_profile()` method for accessing
 the user profile model, should not be used any longer.
+
+Cleaned :djadmin:`cleanup` management command
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This command have contained only expired sessions clean up for years.
+Therefore new command :djadmin:`cleansessions` in ``django.contrib.sessions``
+do the job and :djadmin:`cleanup` command just call it.

docs/topics/http/sessions.txt

@@ -573 +573 @@
 
 .. _Django settings: ../settings/
 
+Management commands
+===================
+
+.. highlight:: console
+
+``django.contrib.sessions`` exposes one management commands.
+
+cleansessions
+-------------
+
+.. django-admin:: cleansessions
+
+Cleans expired sessions from database.
+
+.. versionadded:: 1.5
+
 Technical details
 =================