Merge lp:~canonical-isd-hackers/canonical-identity-provider/revert_cleanup_command into lp:canonical-identity-provider/release

[Danny Tamez]

Reverting cleanup.py

Reverting cleanup.py

[Ricardo Kirkner (ricardokirkner)]

LGTM

review: Approve

=== modified file 'identityprovider/management/commands/cleanup.py'
--- identityprovider/management/commands/cleanup.py	2011-06-15 16:36:56 +0000
+++ identityprovider/management/commands/cleanup.py	2011-07-07 16:50:59 +0000
@@ -1,7 +1,6 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-import sys
 import textwrap
 import time
 from optparse import make_option
@@ -11,6 +10,8 @@
 from django.db import connection, transaction
 from django.utils.translation import ugettext as _
 
+from identityprovider.utils import is_django_13
+
 
 class Command(BaseCommand):
 
@@ -42,21 +43,26 @@
 
         selected_queries = [query for query in queries if options.get(query)]
         if not selected_queries:
-            print textwrap.dedent("""
+            self.console_out(textwrap.dedent("""
                 No items selected to clean up. Please select at least one of
 
                     --sessions
                     --nonces
-            """)
+            """))
 
         for item in selected_queries:
             if verbosity >= 1:
-                print "\nCleaning %s..." % item
+                self.console_out("\nCleaning %s..." % item)
             cursor = connection.cursor()
             cursor.execute(queries[item])
             while cursor.rowcount > 0:
                 if verbosity >= 2:
-                    print "."
-                    sys.stdout.flush()
+                    self.console_out(".")
                 cursor.execute(queries[item])
             transaction.commit_unless_managed()
+
+    def console_out(self, text):
+        if not is_django_13():
+            print text
+        else:
+            self.stdout.write(text)