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.
........

diff --git a/Lib/cgi.py b/Lib/cgi.py
index 310dc02b3c64ce9d8368cdc711d4e3ace5a7e045..b4c620a9e405cbcd1d6e0f66ef8e354d0372a1bc 100755 (executable)
--- a/Lib/cgi.py
+++ b/Lib/cgi.py
@@ -132,7 +132,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
@@ -411,7 +411,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 deb735de65a890c98b1819967b4dde1b92934a1d..cda84e7010fe55d3cd2ca27091a3312155805898 100644 (file)
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -1018,7 +1018,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 httplib, urllib

diff --git a/Lib/urlparse.py b/Lib/urlparse.py
index 99ebe6ad334f842b4d04e59e3e69ec15fd810ebd..4ac986733164ca411b1115fcf06b9aba1b258002 100644 (file)
--- a/Lib/urlparse.py
+++ b/Lib/urlparse.py
@@ -336,10 +336,10 @@ def parse_qs(qs, keep_blank_values=0, strict_parsing=0):
 
         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
@@ -362,10 +362,10 @@ def parse_qsl(qs, keep_blank_values=0, strict_parsing=0):
 
     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.