From c80956521705aef54830ef407b24e3597786ef93 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Tue, 11 Feb 2014 15:21:54 +0000
Subject: [PATCH] Search: Use self.stdout.write for messages in management
 commands

---
 .../commands/search_garbage_collect.py        |  8 +++---
 .../management/commands/update_index.py       | 26 +++++--------------
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/wagtail/wagtailsearch/management/commands/search_garbage_collect.py b/wagtail/wagtailsearch/management/commands/search_garbage_collect.py
index ae37534b4b..08d8d8c1b5 100644
--- a/wagtail/wagtailsearch/management/commands/search_garbage_collect.py
+++ b/wagtail/wagtailsearch/management/commands/search_garbage_collect.py
@@ -6,11 +6,11 @@ from wagtail.wagtailsearch import models
 class Command(NoArgsCommand):
     def handle_noargs(self, **options):
         # Clean daily hits
-        print "Cleaning daily hits records... ",
+        self.stdout.write("Cleaning daily hits records... ")
         models.QueryDailyHits.garbage_collect()
-        print "Done"
+        self.stdout.write("Done")
 
         # Clean queries
-        print "Cleaning query records... ",
+        self.stdout.write("Cleaning query records... ")
         models.Query.garbage_collect()
-        print "Done"
+        self.stdout.write("Done")
diff --git a/wagtail/wagtailsearch/management/commands/update_index.py b/wagtail/wagtailsearch/management/commands/update_index.py
index e9c6fdd96e..522e206236 100644
--- a/wagtail/wagtailsearch/management/commands/update_index.py
+++ b/wagtail/wagtailsearch/management/commands/update_index.py
@@ -6,14 +6,8 @@ from wagtail.wagtailsearch import Indexed, get_search_backend
 
 class Command(BaseCommand):
     def handle(self, backend='default', **options):
-        # Check of we need to be quiet
-        quiet = False
-        if 'quiet' in options and options['quiet']:
-            quiet = True
-
         # Print info
-        if not quiet:
-            print "Getting object list"
+        self.stdout.write("Getting object list")
 
         # Get list of indexed models
         indexed_models = [model for model in models.get_models() if issubclass(model, Indexed)]
@@ -55,27 +49,21 @@ class Command(BaseCommand):
         s = get_search_backend(backend=backend)
 
         # Reset the index
-        if not quiet:
-            print "Reseting index"
+        self.stdout.write("Reseting index")
         s.reset_index()
 
         # Add types
-        if not quiet:
-            print "Adding types"
+        self.stdout.write("Adding types")
         for model in indexed_models:
             s.add_type(model)
 
         # Add objects to index
-        if not quiet:
-            print "Adding objects"
+        self.stdout.write("Adding objects")
         results = s.add_bulk(object_set.values())
-
-        # Print results
-        if not quiet and results:
+        if results:
             for result in results:
-                print result[0], result[1]
+                self.stdout.write(result[0] + ' ' + str(result[1]))
 
         # Refresh index
-        if not quiet:
-            print "Refreshing index"
+        self.stdout.write("Refreshing index")
         s.refresh_index()