For method=POST, append a query string from the environment or from

sys.argv[1], effectively merging the fields.

diff --git a/Lib/cgi.py b/Lib/cgi.py
index 15af21742cd7e21574e54c3adf504e66d87d903d..9fca4d8e7da99cb835e90f954812a49dc9cc2acd 100755 (executable)
--- a/Lib/cgi.py
+++ b/Lib/cgi.py
@@ -439,6 +439,12 @@ def parse(fp=None, environ=os.environ, keep_blank_values=None):
            qs = fp.read(clength)
        else:
            qs = ''                     # Unknown content-type
+       if environ.has_key('QUERY_STRING'): 
+           if qs: qs = qs + '&'
+           qs = qs + environ['QUERY_STRING']
+       elif sys.argv[1:]: 
+           if qs: qs = qs + '&'
+           qs = qs + sys.argv[1]
        environ['QUERY_STRING'] = qs    # XXX Shouldn't, really
     elif environ.has_key('QUERY_STRING'):
        qs = environ['QUERY_STRING']
@@ -961,7 +967,7 @@ class FormContentDict:
 
     """
     def __init__(self, environ=os.environ):
-        self.dict = parse(environ)
+        self.dict = parse(environ=environ)
        self.query_string = environ['QUERY_STRING']
     def __getitem__(self,key):
        return self.dict[key]