--- Django-1.1.1_orig/django/core/management/commands/testserver.py	2008-10-02 14:57:13.000000000 +0200
+++ Django-1.1.1/django/core/management/commands/testserver.py	2010-06-17 19:31:39.000000000 +0200
@@ -1,12 +1,17 @@
 from django.core.management.base import BaseCommand
+from django.dispatch import Signal
 
 from optparse import make_option
 
+testserver_setup = Signal(providing_args=('db_name',))
+
 class Command(BaseCommand):
     option_list = BaseCommand.option_list + (
         make_option('--addrport', action='store', dest='addrport',
             type='string', default='',
             help='port number or ipaddr:port to run the server on'),
+        make_option('--noinput', action='store_false', dest='interactive', default=True,
+            help='Tells Django to NOT prompt the user for input of any kind.'),
     )
     help = 'Runs a development server with data from the given fixture(s).'
     args = '[fixture ...]'
@@ -21,11 +26,14 @@
         addrport = options.get('addrport')
 
         # Create a test database.
-        db_name = connection.creation.create_test_db(verbosity=verbosity)
+        db_name = connection.creation.create_test_db(
+            verbosity=verbosity, autoclobber=not options.get('interactive'))
 
         # Import the fixture data into the test database.
         call_command('loaddata', *fixture_labels, **{'verbosity': verbosity})
 
+        testserver_setup.send(self, db_name=db_name)
+
         # Run the development server. Turn off auto-reloading because it causes
         # a strange error -- it causes this handle() method to be called
         # multiple times.