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

[1.6.x] Fixed #21358 -- Allowed runserver on non-English locales 

Thanks svartalf for the report.
Backport of 2080bce69 from master.
This commit is contained in:
Claude Paroz 2013-11-30 19:07:35 +01:00
parent adb8c563ed
commit c8b4ac814c
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,5 @@
from __future__ import unicode_literals
from optparse import make_option from optparse import make_option
from datetime import datetime from datetime import datetime
import errno import errno
@ -9,6 +11,7 @@ import socket
from django.core.management.base import BaseCommand, CommandError from django.core.management.base import BaseCommand, CommandError
from django.core.servers.basehttp import run, get_internal_wsgi_application from django.core.servers.basehttp import run, get_internal_wsgi_application
from django.utils import autoreload from django.utils import autoreload
from django.utils import six
naiveip_re = re.compile(r"""^(?: naiveip_re = re.compile(r"""^(?:
(?P<addr> (?P<addr>
@ -96,13 +99,17 @@ class Command(BaseCommand):
self.stdout.write("Validating models...\n\n") self.stdout.write("Validating models...\n\n")
self.validate(display_num_errors=True) self.validate(display_num_errors=True)
now = datetime.now().strftime('%B %d, %Y - %X')
if six.PY2:
now = now.decode('utf-8')
self.stdout.write(( self.stdout.write((
"%(started_at)s\n" "%(started_at)s\n"
"Django version %(version)s, using settings %(settings)r\n" "Django version %(version)s, using settings %(settings)r\n"
"Starting development server at http://%(addr)s:%(port)s/\n" "Starting development server at http://%(addr)s:%(port)s/\n"
"Quit the server with %(quit_command)s.\n" "Quit the server with %(quit_command)s.\n"
) % { ) % {
"started_at": datetime.now().strftime('%B %d, %Y - %X'), "started_at": now,
"version": self.get_version(), "version": self.get_version(),
"settings": settings.SETTINGS_MODULE, "settings": settings.SETTINGS_MODULE,
"addr": '[%s]' % self.addr if self._raw_ipv6 else self.addr, "addr": '[%s]' % self.addr if self._raw_ipv6 else self.addr,