Merged revisions 83900 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r83900 | senthil.kumaran | 2010-08-10 01:23:52 +0530 (Tue, 10 Aug 2010) | 3 lines
Fix Issue7007 - Use percent-encoded consistently instead of URL Encoded variations. Docs changed.
........
diff --git a/Doc/library/urllib.rst b/Doc/library/urllib.rst
index 5621f51..eacde19 100644
--- a/Doc/library/urllib.rst
+++ b/Doc/library/urllib.rst
@@ -237,7 +237,7 @@
.. function:: urlencode(query[, doseq])
Convert a mapping object or a sequence of two-element tuples to a
- "url-encoded" string, suitable to pass to :func:`urlopen` above as the
+ "percent-encoded" string, suitable to pass to :func:`urlopen` above as the
optional *data* argument. This is useful to pass a dictionary of form
fields to a ``POST`` request. The resulting string is a series of
``key=value`` pairs separated by ``'&'`` characters, where both *key* and
@@ -262,7 +262,7 @@
.. function:: url2pathname(path)
- Convert the path component *path* from an encoded URL to the local syntax for a
+ Convert the path component *path* from an percent-encoded URL to the local syntax for a
path. This does not accept a complete URL. This function uses :func:`unquote`
to decode *path*.