Author: adrian
Date: 2007-08-26 19:30:37 -0500 (Sun, 26 Aug 2007)
New Revision: 6022

Modified:
   django/trunk/django/core/management/base.py
   django/trunk/django/core/management/commands/runserver.py
   django/trunk/django/core/management/commands/validate.py
Log:
Changed 'validate' and 'runserver' management commands to display the number of 
errors. This was previous behavior before the management.py refactoring

Modified: django/trunk/django/core/management/base.py
===================================================================
--- django/trunk/django/core/management/base.py 2007-08-26 17:47:34 UTC (rev 
6021)
+++ django/trunk/django/core/management/base.py 2007-08-27 00:30:37 UTC (rev 
6022)
@@ -44,7 +44,7 @@
             sys.stderr.write(self.style.ERROR(str('Error: %s\n' % e)))
             sys.exit(1)
 
-    def validate(self, app=None):
+    def validate(self, app=None, display_num_errors=False):
         """
         Validates the given app, raising CommandError for any errors.
 
@@ -61,6 +61,8 @@
             s.seek(0)
             error_text = s.read()
             raise CommandError("One or more models did not validate:\n%s" % 
error_text)
+        if display_num_errors:
+            print "%s error%s found" % (num_errors, num_errors != 1 and 's' or 
'')
 
     def handle(self, *args, **options):
         raise NotImplementedError()

Modified: django/trunk/django/core/management/commands/runserver.py
===================================================================
--- django/trunk/django/core/management/commands/runserver.py   2007-08-26 
17:47:34 UTC (rev 6021)
+++ django/trunk/django/core/management/commands/runserver.py   2007-08-27 
00:30:37 UTC (rev 6022)
@@ -37,7 +37,7 @@
         def inner_run():
             from django.conf import settings
             print "Validating models..."
-            self.validate()
+            self.validate(display_num_errors=True)
             print "\nDjango version %s, using settings %r" % 
(django.get_version(), settings.SETTINGS_MODULE)
             print "Development server is running at http://%s:%s/"; % (addr, 
port)
             print "Quit the server with %s." % quit_command

Modified: django/trunk/django/core/management/commands/validate.py
===================================================================
--- django/trunk/django/core/management/commands/validate.py    2007-08-26 
17:47:34 UTC (rev 6021)
+++ django/trunk/django/core/management/commands/validate.py    2007-08-27 
00:30:37 UTC (rev 6022)
@@ -6,4 +6,4 @@
     requires_model_validation = False
 
     def handle_noargs(self, **options):
-        self.validate()
+        self.validate(display_num_errors=True)


--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to