Update servers to default to an empty QUERY_STRING if

not present in the environ.

Update gzip.py: compresslevel -> compress_level

11 files changed, 31 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index c23a2d0..256f576 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-12-05  Allan Saddi  <asaddi@sahara.flup.org>
 
+	* Update servers to default to an empty QUERY_STRING if
+	  not present in the environ.
+
+	* Update gzip.py: compresslevel -> compress_level
+
 	* Update gzip.py by updating docstrings and renaming
 	  classes/methods/functions to better follow Python naming
 	  conventions. NB: mimeTypes keyword parameter is now
diff --git a/flup/middleware/gzip.py b/flup/middleware/gzip.py
index 11f1bed..abfc1d9 100644
--- a/flup/middleware/gzip.py
+++ b/flup/middleware/gzip.py
@@ -121,7 +121,7 @@ class _GzipMiddleware(object):
     This class is private. See ``GzipMiddleware`` for the public interface.
     """
 
-    def __init__(self, start_response, mime_types, compresslevel):
+    def __init__(self, start_response, mime_types, compress_level):
         self._start_response = start_response
         self._mime_types = mime_types
 
@@ -131,7 +131,7 @@ class _GzipMiddleware(object):
         # See GzipFile.__init__ and GzipFile._init_write in gzip.py
         self._crc = zlib.crc32('')
         self._size = 0
-        self._compress = zlib.compressobj(compresslevel,
+        self._compress = zlib.compressobj(compress_level,
                                           zlib.DEFLATED,
                                           -zlib.MAX_WBITS,
                                           zlib.DEF_MEM_LEVEL,
@@ -206,7 +206,7 @@ class GzipMiddleware(object):
     ``Accept-Encoding`` request header).
     """
 
-    def __init__(self, application, mime_types=None, compresslevel=9):
+    def __init__(self, application, mime_types=None, compress_level=9):
         """Initializes this GzipMiddleware.
 
         ``mime_types``
@@ -214,7 +214,7 @@ class GzipMiddleware(object):
             expressions are accepted. Defaults to ``[text/.*]`` if not
             specified.
 
-        ``compresslevel``
+        ``compress_level``
             The gzip compression level, an integer from 1 to 9; 1 is the
             fastest and produces the least compression, and 9 is the slowest,
             producing the most compression. The default is 9.
@@ -224,7 +224,7 @@ class GzipMiddleware(object):
 
         self._application = application
         self._mime_types = [re.compile(m) for m in mime_types]
-        self._compresslevel = compresslevel
+        self._compress_level = compress_level
 
     def __call__(self, environ, start_response):
         """WSGI application interface."""
@@ -235,7 +235,7 @@ class GzipMiddleware(object):
 
         # All of the work is done in _GzipMiddleware and _GzipIterWrapper.
         g = _GzipMiddleware(start_response, self._mime_types,
-                            self._compresslevel)
+                            self._compress_level)
 
         result = self._application(environ, g.start_response)
 
diff --git a/flup/server/ajp.py b/flup/server/ajp.py
index bb40cb1..b70624d 100644
--- a/flup/server/ajp.py
+++ b/flup/server/ajp.py
@@ -193,6 +193,8 @@ if __name__ == '__main__':
         yield '</table>\n' \
               '</body></html>\n'
 
+    from wsgiref import validate
+    test_app = validate.validator(test_app)
     # Explicitly set bindAddress to *:8009 for testing.
     WSGIServer(test_app,
                bindAddress=('', 8009), allowedServers=None,
diff --git a/flup/server/ajp_base.py b/flup/server/ajp_base.py
index de5ba4e..74dddde 100644
--- a/flup/server/ajp_base.py
+++ b/flup/server/ajp_base.py
@@ -924,6 +924,9 @@ class BaseAJPServer(object):
         environ['PATH_INFO'] = value[len(scriptName):]
         environ['SCRIPT_NAME'] = scriptName
 
+        if not environ.has_key('QUERY_STRING'):
+            environ['QUERY_STRING'] = ''
+
     def error(self, request):
         """
         Override to provide custom error handling. Ideally, however,
diff --git a/flup/server/ajp_fork.py b/flup/server/ajp_fork.py
index 8258634..e798920 100644
--- a/flup/server/ajp_fork.py
+++ b/flup/server/ajp_fork.py
@@ -191,6 +191,8 @@ if __name__ == '__main__':
         yield '</table>\n' \
               '</body></html>\n'
 
+    from wsgiref import validate
+    test_app = validate.validator(test_app)
     # Explicitly set bindAddress to *:8009 for testing.
     WSGIServer(test_app,
                bindAddress=('', 8009), allowedServers=None,
diff --git a/flup/server/fcgi.py b/flup/server/fcgi.py
index 47a7b63..d41b88f 100644
--- a/flup/server/fcgi.py
+++ b/flup/server/fcgi.py
@@ -147,4 +147,6 @@ if __name__ == '__main__':
         yield '</table>\n' \
               '</body></html>\n'
 
+    from wsgiref import validate
+    test_app = validate.validator(test_app)
     WSGIServer(test_app).run()
diff --git a/flup/server/fcgi_base.py b/flup/server/fcgi_base.py
index 3109429..15f59c9 100644
--- a/flup/server/fcgi_base.py
+++ b/flup/server/fcgi_base.py
@@ -1134,6 +1134,8 @@ class BaseFCGIServer(object):
             environ['SCRIPT_NAME'] = ''
         if not environ.has_key('PATH_INFO'):
             environ['PATH_INFO'] = ''
+        if not environ.has_key('QUERY_STRING'):
+            environ['QUERY_STRING'] = ''
 
         # If any of these are missing, it probably signifies a broken
         # server...
diff --git a/flup/server/fcgi_fork.py b/flup/server/fcgi_fork.py
index 10d04e5..ae43752 100644
--- a/flup/server/fcgi_fork.py
+++ b/flup/server/fcgi_fork.py
@@ -162,4 +162,6 @@ if __name__ == '__main__':
         yield '</table>\n' \
               '</body></html>\n'
 
+    from wsgiref import validate
+    test_app = validate.validator(test_app)
     WSGIServer(test_app).run()
diff --git a/flup/server/scgi.py b/flup/server/scgi.py
index e55800f..ee9d769 100644
--- a/flup/server/scgi.py
+++ b/flup/server/scgi.py
@@ -188,5 +188,7 @@ if __name__ == '__main__':
         yield '</table>\n' \
               '</body></html>\n'
 
+    from wsgiref import validate
+    test_app = validate.validator(test_app)
     WSGIServer(test_app,
                loggingLevel=logging.DEBUG).run()
diff --git a/flup/server/scgi_base.py b/flup/server/scgi_base.py
index 98712d9..a1d4d86 100644
--- a/flup/server/scgi_base.py
+++ b/flup/server/scgi_base.py
@@ -492,6 +492,9 @@ class BaseSCGIServer(object):
         environ['PATH_INFO'] = value[len(scriptName):]
         environ['SCRIPT_NAME'] = scriptName
 
+        if not environ.has_key('QUERY_STRING'):
+            environ['QUERY_STRING'] = ''
+
     def error(self, request):
         """
         Override to provide custom error handling. Ideally, however,
diff --git a/flup/server/scgi_fork.py b/flup/server/scgi_fork.py
index 4adaffd..46cb1e0 100644
--- a/flup/server/scgi_fork.py
+++ b/flup/server/scgi_fork.py
@@ -186,5 +186,7 @@ if __name__ == '__main__':
         yield '</table>\n' \
               '</body></html>\n'
 
+    from wsgiref import validate
+    test_app = validate.validator(test_app)
     WSGIServer(test_app,
                loggingLevel=logging.DEBUG).run()