Ticket #2461: iputils.diff

django/core/management.py

@@ -5 +5 @@
 from django.core.exceptions import ImproperlyConfigured
 import os, re, shutil, sys, textwrap
 from optparse import OptionParser
-from django.utils import termcolors
+from django.utils import termcolors, iputils
 
 # For Python 2.3
 if not hasattr(__builtins__, 'set'):
@@ -1027 +1027 @@
     "Starts a lightweight Web server for development."
     from django.core.servers.basehttp import run, AdminMediaHandler, WSGIServerException
     from django.core.handlers.wsgi import WSGIHandler
-    if not addr:
-        addr = '127.0.0.1'
-    if not port.isdigit():
-        sys.stderr.write(style.ERROR("Error: %r is not a valid port number.\n" % port))
-        sys.exit(1)
+##    if not addr:
+##        addr = '127.0.0.1'
+##    if not port.isdigit():
+##        sys.stderr.write(style.ERROR("Error: %r is not a valid port number.\n" % port))
+##        sys.exit(1)
     quit_command = sys.platform == 'win32' and 'CTRL-BREAK' or 'CONTROL-C'
     def inner_run():
         from django.conf import settings
@@ -1261 +1261 @@
         action_mapping[action](name, os.getcwd())
     elif action == 'runserver':
         if len(args) < 2:
-            addr = ''
-            port = '8000'
+            addr, port = iputils.make_ipv4_host_port()
+##            addr = ''
+##            port = '8000'
         else:
-            try:
-                addr, port = args[1].split(':')
-            except ValueError:
-                addr, port = '', args[1]
+            addr, port = iputils.make_ipv4_host_port(args[1])
+##            try:
+##                addr, port = args[1].split(':')
+##            except ValueError:
+##                addr, port = '', args[1]
         action_mapping[action](addr, port, options.use_reloader)
     elif action == 'runfcgi':
         action_mapping[action](args[1:])