summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--django/contrib/admin/utils.py8
-rw-r--r--django/utils/encoding.py4
2 files changed, 5 insertions, 7 deletions
diff --git a/django/contrib/admin/utils.py b/django/contrib/admin/utils.py
index 9bd4aa7857..c55336ad00 100644
--- a/django/contrib/admin/utils.py
+++ b/django/contrib/admin/utils.py
@@ -64,8 +64,8 @@ def quote(s):
"""
Ensure that primary key values do not confuse the admin URLs by escaping
any '/', '_' and ':' and similarly problematic characters.
- Similar to urllib.quote, except that the quoting is slightly different so
- that it doesn't get automatically unquoted by the Web browser.
+ Similar to urllib.parse.quote(), except that the quoting is slightly
+ different so that it doesn't get automatically unquoted by the Web browser.
"""
if not isinstance(s, str):
return s
@@ -78,9 +78,7 @@ def quote(s):
def unquote(s):
- """
- Undo the effects of quote(). Based heavily on urllib.unquote().
- """
+ """Undo the effects of quote(). Based heavily on urllib.parse.unquote()."""
mychr = chr
myatoi = int
list = s.split('_')
diff --git a/django/utils/encoding.py b/django/utils/encoding.py
index 1ac14a66d7..4ff530c406 100644
--- a/django/utils/encoding.py
+++ b/django/utils/encoding.py
@@ -139,8 +139,8 @@ def iri_to_uri(iri):
# sub-delims = "!" / "$" / "&" / "'" / "(" / ")"
# / "*" / "+" / "," / ";" / "="
# unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~"
- # Of the unreserved characters, urllib.quote already considers all but
- # the ~ safe.
+ # Of the unreserved characters, urllib.parse.quote() already considers all
+ # but the ~ safe.
# The % character is also added to the list of safe characters here, as the
# end of section 3.1 of RFC 3987 specifically mentions that % must not be
# converted.