mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-12-01 15:53:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Refs #30608 -- Added django.utils.encoding.punycode().

Browse source
This commit is contained in:
Mariusz Felisiak 2019-07-02 19:32:17 +02:00
parent a5308514fb
commit f226bdbf4e
4 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
django/core/validators.py
View file

@ -5,6 +5,7 @@ from urllib.parse import urlsplit, urlunsplit
from django.core.exceptions import ValidationError
from django.utils.deconstruct import deconstructible
from django.utils.encoding import punycode
from django.utils.functional import SimpleLazyObject
from django.utils.ipv6 import is_valid_ipv6_address
from django.utils.translation import gettext_lazy as _, ngettext_lazy
@ -124,7 +125,7 @@ class URLValidator(RegexValidator):
except ValueError: # for example, "Invalid IPv6 URL"
raise ValidationError(self.message, code=self.code)
try:
netloc = netloc.encode('idna').decode('ascii') # IDN -> ACE
netloc = punycode(netloc) # IDN -> ACE
except UnicodeError: # invalid domain part
raise e
url = urlunsplit((scheme, netloc, path, query, fragment))
@ -199,7 +200,7 @@ class EmailValidator:
not self.validate_domain_part(domain_part)):
# Try for possible IDN domain-part
try:
domain_part = domain_part.encode('idna').decode('ascii')
domain_part = punycode(domain_part)
except UnicodeError:
pass
else: