Merged revisions 83901 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r83901 | senthil.kumaran | 2010-08-10 01:31:35 +0530 (Tue, 10 Aug 2010) | 3 lines

  Fix Issue7007 -  Use percent-encoded consistently instead of URL Encoded variations. Changes in Modules.
........

3 files changed, 7 insertions, 7 deletions

diff --git a/Lib/cgi.py b/Lib/cgi.py
index 9e16a1d..7da2b23 100755
--- a/Lib/cgi.py
+++ b/Lib/cgi.py
@@ -114,7 +114,7 @@ def parse(fp=None, environ=os.environ, keep_blank_values=0, strict_parsing=0):
         environ         : environment dictionary; default: os.environ
 
         keep_blank_values: flag indicating whether blank values in
-            URL encoded forms should be treated as blank strings.
+            percent-encoded forms 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
@@ -394,7 +394,7 @@ class FieldStorage:
         environ         : environment dictionary; default: os.environ
 
         keep_blank_values: flag indicating whether blank values in
-            URL encoded forms should be treated as blank strings.
+            percent-encoded forms 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
diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index 82c418b..9013f8d 100644
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -1012,7 +1012,7 @@ class HTTPHandler(logging.Handler):
         """
         Emit a record.
 
-        Send the record to the Web server as an URL-encoded dictionary
+        Send the record to the Web server as a percent-encoded dictionary
         """
         try:
             import http.client, urllib.parse
diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py
index e1afe52..886c51c 100644
--- a/Lib/urllib/parse.py
+++ b/Lib/urllib/parse.py
@@ -360,10 +360,10 @@ def parse_qs(qs, keep_blank_values=False, strict_parsing=False):
 
         Arguments:
 
-        qs: URL-encoded query string to be parsed
+        qs: percent-encoded query string to be parsed
 
         keep_blank_values: flag indicating whether blank values in
-            URL encoded queries should be treated as blank strings.
+            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
@@ -386,10 +386,10 @@ def parse_qsl(qs, keep_blank_values=False, strict_parsing=False):
 
     Arguments:
 
-    qs: URL-encoded query string to be parsed
+    qs: percent-encoded query string to be parsed
 
     keep_blank_values: flag indicating whether blank values in
-        URL encoded queries should be treated as blank strings.  A
+        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.