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/faq/library.rst b/Doc/faq/library.rst
index 4b0c3d3..6b4f943 100644
--- a/Doc/faq/library.rst
+++ b/Doc/faq/library.rst
@@ -672,7 +672,7 @@
if reply != 200:
sys.stdout.write(httpobj.getfile().read())
-Note that in general for URL-encoded POST operations, query strings must be
+Note that in general for a percent-encoded POST operations, query strings must be
quoted by using :func:`urllib.quote`. For example to send name="Guy Steele,
Jr."::
diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
index 3a0845d..b2f98d0 100644
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -2405,7 +2405,7 @@
.. method:: emit(record)
- Sends the record to the Web server as an URL-encoded dictionary.
+ Sends the record to the Web server as a percent-encoded dictionary.
.. _formatter:
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*.
diff --git a/Doc/library/urlparse.rst b/Doc/library/urlparse.rst
index c3eb559..f3730e3 100644
--- a/Doc/library/urlparse.rst
+++ b/Doc/library/urlparse.rst
@@ -131,7 +131,7 @@
values are lists of values for each name.
The optional argument *keep_blank_values* is a flag indicating whether blank
- values in URL encoded queries should be treated as blank strings. A true value
+ values in percent-encoded queries should be treated as blank strings. A true value
indicates that blanks should be retained as blank strings. The default false
value indicates that blank values are to be ignored and treated as if they were
not included.
@@ -154,7 +154,7 @@
name, value pairs.
The optional argument *keep_blank_values* is a flag indicating whether blank
- values in URL encoded queries should be treated as blank strings. A true value
+ values in percent-encoded queries should be treated as blank strings. A true value
indicates that blanks should be retained as blank strings. The default false
value indicates that blank values are to be ignored and treated as if they were
not included.