Ticket #14928: 14928-1.diff

django/core/management/commands/runserver.py

@@ -1 +1 @@
 from optparse import make_option
 import os
-import re
 import sys
 import socket
 
@@ -9 +8 @@
 from django.core.servers.basehttp import AdminMediaHandler, run, WSGIServerException
 from django.utils import autoreload
 
-naiveip_re = r'^(?:(?P<addr>\d{1,3}(?:\.\d{1,3}){3}|\[[a-fA-F0-9:]+\]):)?(?P<port>\d+)$'
 DEFAULT_PORT = "8000"
 
 class BaseRunserverCommand(BaseCommand):
@@ -41 +39 @@
             self.addr = ''
             self.port = DEFAULT_PORT
         else:
-            m = re.match(naiveip_re, addrport)
-            if m is None:
-                raise CommandError('%r is not a valid port number'
-                                   'or address:port pair.' % addrport)
-            self.addr, self.port = m.groups()
+            try:
+                self.addr, self.port = addrport.rsplit(':', 1)
+            except ValueError:
+                self.addr, self.port = '', addrport
             if not self.port.isdigit():
                 raise CommandError("%r is not a valid port number." % self.port)
             if self.addr: