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 1fc2389df4316c0785ffeb2c234e968ee50c8428..b409bb67fcca11eb4313977fcc95a0479720b8fa 100644 (file)
--- a/Doc/faq/library.rst
+++ b/Doc/faq/library.rst
@@ -669,7 +669,7 @@ Yes. Here's a simple example that uses httplib::
    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 e6832fe16bd560616a067ff2fd17896ad88f05f3..2dddc18894ff5a30c30e9deb19b9291d6a291173 100644 (file)
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -2126,7 +2126,7 @@ supports sending logging messages to a Web server, using either ``GET`` or
 
    .. 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-objects:

diff --git a/Doc/library/urllib.parse.rst b/Doc/library/urllib.parse.rst
index 72b8028f222fa98ec8b8ebad3bdf6df50acc366c..37ddea0524567a8c9397bc9e045eaaf09a6d2305 100644 (file)
--- a/Doc/library/urllib.parse.rst
+++ b/Doc/library/urllib.parse.rst
@@ -114,7 +114,7 @@ The :mod:`urllib.parse` module defines the following functions:
    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.
@@ -134,7 +134,7 @@ The :mod:`urllib.parse` module defines the following functions:
    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.
@@ -327,7 +327,7 @@ The :mod:`urllib.parse` module defines the following functions:
 .. function:: urlencode(query, doseq=False, safe='', encoding=None, errors=None)
 
    Convert a mapping object or a sequence of two-element tuples, which may
-   either be a :class:`str` or a :class:`bytes`,  to a "url-encoded" string,
+   either be a :class:`str` or a :class:`bytes`,  to a "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 ``'&'``

diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
index 75ff857d458a6e5ad8114756bb04828ea0c76dd1..1b90d32402e7046c93ac406231275d565f09dfdf 100644 (file)
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -140,7 +140,7 @@ The :mod:`urllib.request` module defines the following functions:
 
 .. function:: url2pathname(path)
 
-   Convert the path component *path* from an encoded URL to the local syntax for a
+   Convert the path component *path* from a 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*.