Python 3.4 compatibility & fixed some of the tests.

[django-cas-provider.git] / cas_provider / management / commands / cleanuptickets.py

diff --git a/cas_provider/management/commands/cleanuptickets.py b/cas_provider/management/commands/cleanuptickets.py
index 751e220..c951993 100644 (file)
--- a/cas_provider/management/commands/cleanuptickets.py
+++ b/cas_provider/management/commands/cleanuptickets.py
@@ -6,24 +6,34 @@ Calls ``ServiceTickets.objects.delete_expired_users()``, which
 contains the actual logic for determining which accounts are deleted.
 
 """
+from __future__ import print_function
 
 from django.core.management.base import NoArgsCommand
-from django.core.management.base import CommandError
 from django.conf import settings
 
 import datetime
 
-from cas_provider.models import ServiceTicket
+from cas_provider.models import ServiceTicket, LoginTicket
 
 class Command(NoArgsCommand):
     help = "Delete expired service tickets from the database"
 
     def handle_noargs(self, **options):
+        print("Service tickets:")
         tickets = ServiceTicket.objects.all()
         for ticket in tickets:
             expiration = datetime.timedelta(minutes=settings.CAS_TICKET_EXPIRATION)
             if datetime.datetime.now() > ticket.created + expiration:
-                print "Deleting %s..." % ticket.ticket
+                print("Deleting %s..." % ticket.ticket)
                 ticket.delete()
             else:
-                print "%s not expired..." % ticket.ticket
\ No newline at end of file
+                print("%s not expired..." % ticket.ticket)
+        tickets = LoginTicket.objects.all()
+        print("Login tickets:")
+        for ticket in tickets:
+            expiration = datetime.timedelta(minutes=settings.CAS_TICKET_EXPIRATION)
+            if datetime.datetime.now() > ticket.created + expiration:
+                print("Deleting %s..." % ticket.ticket)
+                ticket.delete()
+            else:
+                print("%s not expired..." % ticket.ticket)