p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #15112 -- Ensure that IPv6 addresses are correctly displayed in the admin. Thanks to oxy for the report, and Łukasz Rekucki for the test case. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15343 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2011-01-27 03:15:12 +00:00
parent a5cac772b6
commit 9acd00a72e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
django/core/management/commands/runserver.py
View File

@ -63,6 +63,7 @@ class BaseRunserverCommand(BaseCommand):
raise CommandError('"%s" is not a valid IPv6 address.' % self.addr)
if not self.addr:
self.addr = self.use_ipv6 and '::1' or '127.0.0.1'
self._raw_ipv6 = bool(self.use_ipv6)
self.run(*args, **options)
def run(self, *args, **options):

6
tests/regressiontests/admin_scripts/tests.py
View File

@ -1025,10 +1025,10 @@ class ManageRunserver(AdminScriptTestCase):
# IPv6
self.cmd.handle(addrport="", use_ipv6=True)
self.assertServerSettings('::1', '8000', ipv6=True)
self.assertServerSettings('::1', '8000', ipv6=True, raw_ipv6=True)
self.cmd.handle(addrport="7000", use_ipv6=True)
self.assertServerSettings('::1', '7000', ipv6=True)
self.assertServerSettings('::1', '7000', ipv6=True, raw_ipv6=True)
self.cmd.handle(addrport="[2001:0db8:1234:5678::9]:7000")
self.assertServerSettings('2001:0db8:1234:5678::9', '7000', ipv6=True, raw_ipv6=True)
@ -1045,7 +1045,7 @@ class ManageRunserver(AdminScriptTestCase):
# Potentially ambiguous
# Only 4 characters, all of which coudl be in an ipv6 address
# Only 4 characters, all of which could be in an ipv6 address
self.cmd.handle(addrport="beef:7654")
self.assertServerSettings('beef', '7654')