mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 09:49:12 +00:00
Code Issues 32 Releases Wiki Activity

Move idna import to module level

Browse Source
This commit is contained in:
Julien BERNARD 2022-11-14 21:08:09 -05:00
parent 85b066c9f2
commit 8f9165bfed
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
django/utils/encoding.py
View File

@ -6,6 +6,12 @@ from urllib.parse import quote
from django.utils.functional import Promise from django.utils.functional import Promise
try:
# try importing idna package for IDNA 2008 compliance
import idna
except ImportError:
idna = None
class DjangoUnicodeDecodeError(UnicodeDecodeError): class DjangoUnicodeDecodeError(UnicodeDecodeError):
def __init__(self, obj, *args): def __init__(self, obj, *args):
@ -213,18 +219,16 @@ def punycode(domain):
"""Return the Punycode of the given domain if it's non-ASCII.""" """Return the Punycode of the given domain if it's non-ASCII."""
if not domain: if not domain:
return domain return domain
if idna:
try: try:
# try importing idna package for IDNA 2008 compliance
import idna
# enable uts46 mapping for mapping: uppercase letters, normalization, etc. # enable uts46 mapping for mapping: uppercase letters, normalization, etc.
return idna.encode(domain, uts46=True, transitional=False).decode("ascii") return idna.encode(domain, uts46=True, transitional=False).decode("ascii")
except ImportError:
# will fall back to Python IDNA 2003
return domain.encode("idna").decode("ascii")
except idna.IDNAError as e: except idna.IDNAError as e:
raise UnicodeError(e) from e raise UnicodeError(e) from e
# will fall back to Python IDNA 2003
return domain.encode("idna").decode("ascii")
def repercent_broken_unicode(path): def repercent_broken_unicode(path):
""" """