Ticket #14332: uniform_addrport_handling.patch

django/core/management/commands/runserver.py

@@ -15 +15 @@
             help='Allows serving static files even if DEBUG is True.'),
         make_option('--adminmedia', dest='admin_media_path', default='',
             help='Specifies the directory from which to serve admin media.'),
+        make_option('--addrport', action='store', dest='addrport',
+            type='string', default='',
+            help='port number or ipaddr:port to run the server on'),
     )
     help = "Starts a lightweight Web server for development."
     args = '[optional port number, or ipaddr:port]'
@@ -22 +25 @@
     # Validation is called explicitly each time the server is reloaded.
     requires_model_validation = False
 
-    def handle(self, addrport='', *args, **options):
+    def handle(self, *args, **options):
         import django
         from django.core.servers.basehttp import run, AdminMediaHandler, WSGIServerException
         from django.core.handlers.wsgi import WSGIHandler
         from django.contrib.staticfiles.handlers import StaticFilesHandler
-        if args:
+        # addrport can be passed either as either positional or keyword option.
+        # keyword supersedes positional
+        addrport = options.get('addrport')
+        if len(args) > 1:
             raise CommandError('Usage is runserver %s' % self.args)
-        if not addrport:
-            addr = ''
-            port = '8000'
-        else:
-            try:
-                addr, port = addrport.split(':')
-            except ValueError:
-                addr, port = '', addrport
+        addrport = addrport or (args and args[0]) or '8000'
+        try:
+            addr, port = addrport.split(':')
+        except ValueError:
+            addr, port = '', addrport
         if not addr:
             addr = '127.0.0.1'
 

django/core/management/commands/testserver.py

@@ -1 +1 @@
 from django.core.management.base import BaseCommand
 
 from optparse import make_option
+import re
 
 class Command(BaseCommand):
     option_list = BaseCommand.option_list + (
@@ -11 +12 @@
             help='port number or ipaddr:port to run the server on'),
     )
     help = 'Runs a development server with data from the given fixture(s).'
-    args = '[fixture ...]'
+    args = '[optional port number, or ipaddr:port] [fixture ...]'
 
     requires_model_validation = False
 
@@ -23 +24 @@
         interactive = options.get('interactive', True)
         addrport = options.get('addrport')
 
+        # if no --addrport option specified, check to see whether first element
+        # of fixture labels looks like [address:]port. If so, use it as an addrport
+        # spec.
+        if not addrport and len(fixture_labels) > 0:
+            r = re.compile('(.+:)?\d+$')
+            if r.match(fixture_labels[0]):
+                addrport = fixture_labels[0]
+                fixture_labels = fixture_labels[1:]
+
         # Create a test database.
         db_name = connection.creation.create_test_db(verbosity=verbosity, autoclobber=not interactive)
 

docs/man/django-admin.1

@@ -75 +75 @@
 .B runfcgi help
 for help on the KEY=val pairs.
 .TP
-.BI "runserver [" "\-\-noreload" "] [" "\-\-nostatic" "] [" "\-\-insecure" "] [" "\-\-adminmedia=ADMIN_MEDIA_PATH" "] [" "port|ipaddr:port" "]"
+.BI "runserver [" "\-\-noreload" "] [" "\-\-nostatic" "] [" "\-\-insecure" "] [" "\-\-adminmedia=ADMIN_MEDIA_PATH" "] [" "\-\-addrport=port|ipaddr:port" "] [" "port|ipaddr:port" "]"
 Starts a lightweight Web server for development.
 .TP
 .BI "shell [" "\-\-plain" "]"
@@ -132 +132 @@
 Runs the test suite for the specified applications, or the entire project if
 no apps are specified
 .TP
-.BI "testserver [" "\-\-addrport=ipaddr|port" "] [" "fixture fixture ..." "]"
+.BI "testserver [" "\-\-addrport=ipaddr|ipaddr:port" "] [" "ipaddr:port|port" "] [" "fixture fixture ..." "]"
 Runs the test suite for the specified applications, or the entire project if
 no apps are specified
 .TP

docs/ref/django-admin.txt

@@ -716 +716 @@
 Port 8000 on IP address 1.2.3.4::
 
         django-admin.py runserver 1.2.3.4:8000
+        django-admin.py runserver --addrport=1.2.3.4:8000
 
 Port 7000 on IP address 127.0.0.1::
 
     django-admin.py runserver 7000
+    django-admin.py runserver --addrport=7000
 
 Port 7000 on IP address 1.2.3.4::
 
     django-admin.py runserver 1.2.3.4:7000
+    django-admin.py runserver --addrport=1.2.3.4:7000
 
 Serving static files with the development server
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -945 +948 @@
 Use the :djadminopt:`--failfast` option to stop running tests and report the failure
 immediately after a test fails.
 
-testserver <fixture fixture ...>
+testserver [ipaddr:port|port] <fixture fixture ...>
 --------------------------------
 
 .. django-admin:: testserver
@@ -991 +994 @@
 the default of 127.0.0.1:8000. This value follows exactly the same format and
 serves exactly the same function as the argument to the ``runserver`` command.
 
+For consistency with the ``runserver`` command, you can also specify
+the IP address and port before the list of fixtures. If testserver
+finds something of the form ``ipaddress:port|port`` as the first item
+of the fixture list, it will take it to be an address specification.
+
 Examples:
 
 To run the test server on port 7000 with ``fixture1`` and ``fixture2``::
 
     django-admin.py testserver --addrport 7000 fixture1 fixture2
+    django-admin.py testserver 7000 fixture1 fixture2
     django-admin.py testserver fixture1 fixture2 --addrport 7000
 
-(The above statements are equivalent. We include both of them to demonstrate
-that it doesn't matter whether the options come before or after the fixture
-arguments.)
+(The above statements are equivalent. We include all of them to
+demonstrate that it doesn't matter whether the options come before or
+after the fixture arguments when you use the keyword argument form for
+the address specification, but it does matter if you omit the keyword.)
 
 To run on 1.2.3.4:7000 with a ``test`` fixture::
 
     django-admin.py testserver --addrport 1.2.3.4:7000 test
+    django-admin.py testserver 1.2.3.4:7000 test
 
 .. versionadded:: 1.3