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

[py3] Re-decoded string after idna encoding

This commit is contained in:
Claude Paroz 2012-08-11 22:44:42 +02:00
parent 6602103338
commit 900816464d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/core/validators.py
View File

@ -57,7 +57,7 @@ class URLValidator(RegexValidator):
value = smart_text(value) value = smart_text(value)
scheme, netloc, path, query, fragment = urlsplit(value) scheme, netloc, path, query, fragment = urlsplit(value)
try: try:
netloc = netloc.encode('idna') # IDN -> ACE netloc = netloc.encode('idna').decode('ascii') # IDN -> ACE
except UnicodeError: # invalid domain part except UnicodeError: # invalid domain part
raise e raise e
url = urlunsplit((scheme, netloc, path, query, fragment)) url = urlunsplit((scheme, netloc, path, query, fragment))
@ -84,7 +84,7 @@ class EmailValidator(RegexValidator):
if value and '@' in value: if value and '@' in value:
parts = value.split('@') parts = value.split('@')
try: try:
parts[-1] = parts[-1].encode('idna') parts[-1] = parts[-1].encode('idna').decode('ascii')
except UnicodeError: except UnicodeError:
raise e raise e
super(EmailValidator, self).__call__('@'.join(parts)) super(EmailValidator, self).__call__('@'.join(parts))

4
django/utils/html.py
View File

@ -143,7 +143,7 @@ def smart_urlquote(url):
# Handle IDN before quoting. # Handle IDN before quoting.
scheme, netloc, path, query, fragment = urlsplit(url) scheme, netloc, path, query, fragment = urlsplit(url)
try: try:
netloc = netloc.encode('idna') # IDN -> ACE netloc = netloc.encode('idna').decode('ascii') # IDN -> ACE
except UnicodeError: # invalid domain part except UnicodeError: # invalid domain part
pass pass
else: else:
@ -206,7 +206,7 @@ def urlize(text, trim_url_limit=None, nofollow=False, autoescape=False):
elif not ':' in middle and simple_email_re.match(middle): elif not ':' in middle and simple_email_re.match(middle):
local, domain = middle.rsplit('@', 1) local, domain = middle.rsplit('@', 1)
try: try:
domain = domain.encode('idna') domain = domain.encode('idna').decode('ascii')
except UnicodeError: except UnicodeError:
continue continue
url = 'mailto:%s@%s' % (local, domain) url = 'mailto:%s@%s' % (local, domain)