change debug to default to False

for paste entry points, get debug from local_conf, then global_conf,
  then just use False

12 files changed, 64 insertions, 30 deletions

diff --git a/flup/server/__init__.py b/flup/server/__init__.py
index 792d600..c13cc34 100644
--- a/flup/server/__init__.py
+++ b/flup/server/__init__.py
@@ -1 +1,5 @@
 #
+class NoDefault(object):
+    pass
+
+__all__ = [ 'NoDefault', ]
diff --git a/flup/server/ajp.py b/flup/server/ajp.py
index ca26fca..e7db7c3 100644
--- a/flup/server/ajp.py
+++ b/flup/server/ajp.py
@@ -103,7 +103,7 @@ class WSGIServer(BaseAJPServer, ThreadedServer):
     def __init__(self, application, scriptName='', environ=None,
                  multithreaded=True, multiprocess=False,
                  bindAddress=('localhost', 8009), allowedServers=None,
-                 loggingLevel=logging.INFO, debug=True, **kw):
+                 loggingLevel=logging.INFO, debug=False, **kw):
         """
         scriptName is the initial portion of the URL path that "belongs"
         to your application. It is used to determine PATH_INFO (which doesn't
diff --git a/flup/server/ajp_base.py b/flup/server/ajp_base.py
index 2acff01..a2e9963 100644
--- a/flup/server/ajp_base.py
+++ b/flup/server/ajp_base.py
@@ -41,10 +41,9 @@ import time
 import thread
 import threading
 
-__all__ = ['BaseAJPServer']
+from flup.server import NoDefault
 
-class NoDefault(object):
-    pass
+__all__ = ['BaseAJPServer']
 
 # Packet header prefixes.
 SERVER_PREFIX = '\x12\x34'
@@ -752,7 +751,7 @@ class BaseAJPServer(object):
     def __init__(self, application, scriptName='', environ=None,
                  multithreaded=True, multiprocess=False,
                  bindAddress=('localhost', 8009), allowedServers=NoDefault,
-                 loggingLevel=logging.INFO, debug=True):
+                 loggingLevel=logging.INFO, debug=False):
         """
         scriptName is the initial portion of the URL path that "belongs"
         to your application. It is used to determine PATH_INFO (which doesn't
diff --git a/flup/server/ajp_fork.py b/flup/server/ajp_fork.py
index 111b29c..1006729 100644
--- a/flup/server/ajp_fork.py
+++ b/flup/server/ajp_fork.py
@@ -102,7 +102,7 @@ class WSGIServer(BaseAJPServer, PreforkServer):
     """
     def __init__(self, application, scriptName='', environ=None,
                  bindAddress=('localhost', 8009), allowedServers=None,
-                 loggingLevel=logging.INFO, debug=True, **kw):
+                 loggingLevel=logging.INFO, debug=False, **kw):
         """
         scriptName is the initial portion of the URL path that "belongs"
         to your application. It is used to determine PATH_INFO (which doesn't
diff --git a/flup/server/fcgi.py b/flup/server/fcgi.py
index b8441c9..bc621ee 100644
--- a/flup/server/fcgi.py
+++ b/flup/server/fcgi.py
@@ -64,7 +64,7 @@ class WSGIServer(BaseFCGIServer, ThreadedServer):
     def __init__(self, application, environ=None,
                  multithreaded=True, multiprocess=False,
                  bindAddress=None, umask=None, multiplexed=False,
-                 debug=True, roles=(FCGI_RESPONDER,), forceCGI=False, **kw):
+                 debug=False, roles=(FCGI_RESPONDER,), forceCGI=False, **kw):
         """
         environ, if present, must be a dictionary-like object. Its
         contents will be copied into application's environ. Useful
diff --git a/flup/server/fcgi_base.py b/flup/server/fcgi_base.py
index 31e0ac6..72396a9 100644
--- a/flup/server/fcgi_base.py
+++ b/flup/server/fcgi_base.py
@@ -902,7 +902,7 @@ class BaseFCGIServer(object):
     def __init__(self, application, environ=None,
                  multithreaded=True, multiprocess=False,
                  bindAddress=None, umask=None, multiplexed=False,
-                 debug=True, roles=(FCGI_RESPONDER,),
+                 debug=False, roles=(FCGI_RESPONDER,),
                  forceCGI=False):
         """
         bindAddress, if present, must either be a string or a 2-tuple. If
diff --git a/flup/server/fcgi_fork.py b/flup/server/fcgi_fork.py
index d79b777..3936807 100644
--- a/flup/server/fcgi_fork.py
+++ b/flup/server/fcgi_fork.py
@@ -64,7 +64,7 @@ class WSGIServer(BaseFCGIServer, PreforkServer):
     """
     def __init__(self, application, environ=None,
                  bindAddress=None, umask=None, multiplexed=False,
-                 debug=True, roles=(FCGI_RESPONDER,), forceCGI=False, **kw):
+                 debug=False, roles=(FCGI_RESPONDER,), forceCGI=False, **kw):
         """
         environ, if present, must be a dictionary-like object. Its
         contents will be copied into application's environ. Useful
diff --git a/flup/server/fcgi_single.py b/flup/server/fcgi_single.py
index e62b08f..c0e4d69 100644
--- a/flup/server/fcgi_single.py
+++ b/flup/server/fcgi_single.py
@@ -64,7 +64,7 @@ class WSGIServer(BaseFCGIServer, SingleServer):
     """
     def __init__(self, application, environ=None,
                  bindAddress=None, umask=None, multiplexed=False,
-                 debug=True, roles=(FCGI_RESPONDER,), forceCGI=False, **kw):
+                 debug=False, roles=(FCGI_RESPONDER,), forceCGI=False, **kw):
         """
         environ, if present, must be a dictionary-like object. Its
         contents will be copied into application's environ. Useful
diff --git a/flup/server/paste_factory.py b/flup/server/paste_factory.py
index 1bcc867..d94c084 100644
--- a/flup/server/paste_factory.py
+++ b/flup/server/paste_factory.py
@@ -1,5 +1,8 @@
 # (c) 2005 Ian Bicking and contributors; written for Paste (http://pythonpaste.org)
 # Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php
+
+from flup.server import NoDefault
+
 def asbool(obj):
     if isinstance(obj, (str, unicode)):
         obj = obj.strip().lower()
@@ -26,35 +29,43 @@ def aslist(obj, sep=None, strip=True):
         return [obj]
 
 def run_ajp_thread(wsgi_app, global_conf,
-                   scriptName='', host='localhost', port='8009',
-                   allowedServers='127.0.0.1'):
+                   scriptName=NoDefault, host='localhost', port='8009',
+                   allowedServers='127.0.0.1', debug=NoDefault):
     import flup.server.ajp
     addr = (host, int(port))
+    if debug is NoDefault:
+        debug = global_conf.get('debug', False)
+    debug = asbool(debug)
     s = flup.server.ajp.WSGIServer(
         wsgi_app,
         scriptName=scriptName,
         bindAddress=addr,
         allowedServers=aslist(allowedServers),
+        debug=debug,
         )
     s.run()
-    
+
 def run_ajp_fork(wsgi_app, global_conf,
                  scriptName='', host='localhost', port='8009',
-                 allowedServers='127.0.0.1'):
+                 allowedServers='127.0.0.1', debug=NoDefault):
     import flup.server.ajp_fork
     addr = (host, int(port))
+    if debug is NoDefault:
+        debug = global_conf.get('debug', False)
+    debug = asbool(debug)
     s = flup.server.ajp_fork.WSGIServer(
         wsgi_app,
         scriptName=scriptName,
         bindAddress=addr,
         allowedServers=aslist(allowedServers),
+        debug=debug,
         )
     s.run()
 
 def run_fcgi_thread(wsgi_app, global_conf,
                     host=None, port=None,
                     socket=None, umask=None,
-                    multiplexed=False):
+                    multiplexed=False, debug=NoDefault):
     import flup.server.fcgi
     if socket:
         assert host is None and port is None
@@ -66,16 +77,21 @@ def run_fcgi_thread(wsgi_app, global_conf,
         sock = None
     if umask is not None:
         umask = int(umask)
+    if debug is NoDefault:
+        debug = global_conf.get('debug', False)
+    debug = asbool(debug)
     s = flup.server.fcgi.WSGIServer(
         wsgi_app,
         bindAddress=sock, umask=umask,
-        multiplexed=asbool(multiplexed))
+        multiplexed=asbool(multiplexed),
+        debug=debug)
     s.run()
 
 def run_fcgi_fork(wsgi_app, global_conf,
                   host=None, port=None,
                   socket=None, umask=None,
-                  multiplexed=False):
+                  multiplexed=False,
+                  debug=NoDefault):
     import flup.server.fcgi_fork
     if socket:
         assert host is None and port is None
@@ -87,35 +103,49 @@ def run_fcgi_fork(wsgi_app, global_conf,
         sock = None
     if umask is not None:
         umask = int(umask)
+    if debug is NoDefault:
+        debug = global_conf.get('debug', False)
+    debug = asbool(debug)
     s = flup.server.fcgi_fork.WSGIServer(
         wsgi_app,
         bindAddress=sock, umask=umask,
-        multiplexed=asbool(multiplexed))
+        multiplexed=asbool(multiplexed),
+        debug=debug)
     s.run()
 
 def run_scgi_thread(wsgi_app, global_conf,
-                    scriptName='', host='localhost', port='4000',
-                    allowedServers='127.0.0.1'):
+                    scriptName=NoDefault, host='localhost', port='4000',
+                    allowedServers='127.0.0.1',
+                    debug=NoDefault):
     import flup.server.scgi
     addr = (host, int(port))
+    if debug is NoDefault:
+        debug = global_conf.get('debug', False)
+    debug = asbool(debug)
     s = flup.server.scgi.WSGIServer(
         wsgi_app,
         scriptName=scriptName,
         bindAddress=addr,
         allowedServers=aslist(allowedServers),
+        debug=debug,
         )
     s.run()
 
 def run_scgi_fork(wsgi_app, global_conf,
-                  scriptName='', host='localhost', port='4000',
-                  allowedServers='127.0.0.1'):
+                  scriptName=NoDefault, host='localhost', port='4000',
+                  allowedServers='127.0.0.1',
+                  debug=NoDefault):
     import flup.server.scgi_fork
     addr = (host, int(port))
+    if debug is NoDefault:
+        debug = global_conf.get('debug', False)
+    debug = asbool(debug)
     s = flup.server.scgi_fork.WSGIServer(
         wsgi_app,
         scriptName=scriptName,
         bindAddress=addr,
         allowedServers=aslist(allowedServers),
+        debug=debug,
         )
     s.run()
-    
+
diff --git a/flup/server/scgi.py b/flup/server/scgi.py
index e7071b6..7e48c56 100644
--- a/flup/server/scgi.py
+++ b/flup/server/scgi.py
@@ -66,7 +66,8 @@ __version__ = '$Revision$'
 import logging
 import socket
 
-from flup.server.scgi_base import BaseSCGIServer, Connection, NoDefault
+from flup.server import NoDefault
+from flup.server.scgi_base import BaseSCGIServer, Connection
 from flup.server.threadedserver import ThreadedServer
 
 __all__ = ['WSGIServer']
@@ -91,7 +92,7 @@ class WSGIServer(BaseSCGIServer, ThreadedServer):
                  multithreaded=True, multiprocess=False,
                  bindAddress=('localhost', 4000), umask=None,
                  allowedServers=None,
-                 loggingLevel=logging.INFO, debug=True, **kw):
+                 loggingLevel=logging.INFO, debug=False, **kw):
         """
         scriptName is the initial portion of the URL path that "belongs"
         to your application. It is used to determine PATH_INFO (which doesn't
diff --git a/flup/server/scgi_base.py b/flup/server/scgi_base.py
index 58a3e6a..e4f8f4c 100644
--- a/flup/server/scgi_base.py
+++ b/flup/server/scgi_base.py
@@ -45,8 +45,7 @@ import threading
 
 __all__ = ['BaseSCGIServer']
 
-class NoDefault(object):
-    pass
+from flup.server import NoDefault
 
 # The main classes use this name for logging.
 LoggerName = 'scgi-wsgi'
@@ -278,7 +277,7 @@ class BaseSCGIServer(object):
                  multithreaded=True, multiprocess=False,
                  bindAddress=('localhost', 4000), umask=None,
                  allowedServers=NoDefault,
-                 loggingLevel=logging.INFO, debug=True):
+                 loggingLevel=logging.INFO, debug=False):
         """
         scriptName is the initial portion of the URL path that "belongs"
         to your application. It is used to determine PATH_INFO (which doesn't
diff --git a/flup/server/scgi_fork.py b/flup/server/scgi_fork.py
index 1c7506f..70cde30 100644
--- a/flup/server/scgi_fork.py
+++ b/flup/server/scgi_fork.py
@@ -66,7 +66,8 @@ __version__ = '$Revision$'
 import logging
 import socket
 
-from flup.server.scgi_base import BaseSCGIServer, Connection, NoDefault
+from flup.server import NoDefault
+from flup.server.scgi_base import BaseSCGIServer, Connection
 from flup.server.preforkserver import PreforkServer
 
 __all__ = ['WSGIServer']
@@ -90,7 +91,7 @@ class WSGIServer(BaseSCGIServer, PreforkServer):
     def __init__(self, application, scriptName=NoDefault, environ=None,
                  bindAddress=('localhost', 4000), umask=None,
                  allowedServers=None,
-                 loggingLevel=logging.INFO, debug=True, **kw):
+                 loggingLevel=logging.INFO, debug=False, **kw):
         """
         scriptName is the initial portion of the URL path that "belongs"
         to your application. It is used to determine PATH_INFO (which doesn't