get rid of meaningless verbose adjustment

9 files changed, 30 insertions, 31 deletions

diff --git a/TODO.txt b/TODO.txt
index 451e3c7..b622c3a 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -16,4 +16,3 @@
 
 - Get rid of dual-moded-ness.
 
-- "Verbose".
diff --git a/waitress/__init__.py b/waitress/__init__.py
index bde0764..7383f8c 100644
--- a/waitress/__init__.py
+++ b/waitress/__init__.py
@@ -1,9 +1,10 @@
 from waitress.server import WSGIServer
 
-def serve(app, _server=WSGIServer, **kw):
-    # _server is a test shim
+def serve(app, **kw):
+    _server = kw.pop('_server', WSGIServer) # test shim
+    _quiet = kw.pop('_quiet', False)
     server = _server(app, **kw)
-    if server.adj.verbose: # pragma: no cover
+    if not _quiet: # pragma: no cover
         print('serving on http://%s:%s' % (server.effective_host,
                                            server.effective_port))
     server.run()
diff --git a/waitress/adjustments.py b/waitress/adjustments.py
index 39b193f..619b372 100644
--- a/waitress/adjustments.py
+++ b/waitress/adjustments.py
@@ -35,9 +35,6 @@ class Adjustments(object):
     # wsgi url scheme
     url_scheme = 'http'
 
-    # verbose
-    verbose = True
-
     # ident
     ident = 'waitress'
 
@@ -86,32 +83,32 @@ class Adjustments(object):
         for k, v in kw.items():
             if k == 'host':
                 v = str(v)
-            if k == 'port':
+            elif k == 'port':
                 v = int(v)
-            if k == 'threads':
+            elif k == 'threads':
                 v = int(v)
-            if k == 'url_scheme':
+            elif k == 'url_scheme':
                 v = str(v)
-            if k == 'backlog':
+            elif k == 'backlog':
                 v = int(v)
-            if k == 'recv_bytes':
+            elif k == 'recv_bytes':
                 v = int(v)
-            if k == 'send_bytes':
+            elif k == 'send_bytes':
                 v = int(v)
-            if k == 'outbuf_overflow':
+            elif k == 'outbuf_overflow':
                 v = int(v)
-            if k == 'inbuf_overflow':
+            elif k == 'inbuf_overflow':
                 v = int(v)
-            if k == 'connection_limit':
+            elif k == 'connection_limit':
                 v = int(v)
-            if k == 'cleanup_interval':
+            elif k == 'cleanup_interval':
                 v = int(v)
-            if k == 'channel_timeout':
+            elif k == 'channel_timeout':
                 v = int(v)
-            if k == 'log_socket_errors':
-                v = asbool(v)
-            if k == 'verbose':
+            elif k == 'log_socket_errors':
                 v = asbool(v)
+            else:
+                raise ValueError('Unknown adjustment %r' % k)
             setattr(self, k, v)
         if (sys.platform[:3] == "win" and
             self.host == 'localhost' ): # pragma: no cover
diff --git a/waitress/tests/fixtureapps/badcl.py b/waitress/tests/fixtureapps/badcl.py
index e3cf2ee..15ccbe9 100644
--- a/waitress/tests/fixtureapps/badcl.py
+++ b/waitress/tests/fixtureapps/badcl.py
@@ -13,5 +13,5 @@ def app(environ, start_response):
 
 if __name__ == '__main__':
     from waitress import serve
-    serve(app, port=61523, verbose=False)
+    serve(app, port=61523, _quiet=True)
     
diff --git a/waitress/tests/fixtureapps/echo.py b/waitress/tests/fixtureapps/echo.py
index c5e5a0f..b09d736 100644
--- a/waitress/tests/fixtureapps/echo.py
+++ b/waitress/tests/fixtureapps/echo.py
@@ -12,5 +12,6 @@ def app(environ, start_response):
 
 if __name__ == '__main__':
     from waitress import serve
-    serve(app, port=61523, verbose=False)
+    serve(app, port=61523, _quiet=True)
+    
     
diff --git a/waitress/tests/fixtureapps/nocl.py b/waitress/tests/fixtureapps/nocl.py
index f19a9d2..d3ec8cc 100644
--- a/waitress/tests/fixtureapps/nocl.py
+++ b/waitress/tests/fixtureapps/nocl.py
@@ -10,5 +10,5 @@ def app(environ, start_response):
 
 if __name__ == '__main__':
     from waitress import serve
-    serve(app, port=61523, verbose=False)
+    serve(app, port=61523, _quiet=True)
     
diff --git a/waitress/tests/fixtureapps/writecb.py b/waitress/tests/fixtureapps/writecb.py
index 7d4824c..f868e16 100644
--- a/waitress/tests/fixtureapps/writecb.py
+++ b/waitress/tests/fixtureapps/writecb.py
@@ -15,5 +15,5 @@ def app(environ, start_response):
 
 if __name__ == '__main__':
     from waitress import serve
-    serve(app, port=61523, verbose=False)
+    serve(app, port=61523, _quiet=True)
     
diff --git a/waitress/tests/test_adjustments.py b/waitress/tests/test_adjustments.py
index 73bb72e..5ce2a5c 100644
--- a/waitress/tests/test_adjustments.py
+++ b/waitress/tests/test_adjustments.py
@@ -42,14 +42,13 @@ class TestAdjustments(unittest.TestCase):
         from waitress.adjustments import Adjustments
         return Adjustments(**kw)
     
-    def test_it(self):
+    def test_goodvars(self):
         inst = self._makeOne(
             host='host', port='8080', threads='5',
             url_scheme='https', backlog='20', recv_bytes='200',
             send_bytes='300', outbuf_overflow='400', inbuf_overflow='500',
             connection_limit='1000', cleanup_interval='1100',
-            channel_timeout='1200', log_socket_errors='true',
-            verbose='false')
+            channel_timeout='1200', log_socket_errors='true')
         self.assertEqual(inst.host, 'host')
         self.assertEqual(inst.port, 8080)
         self.assertEqual(inst.threads, 5)
@@ -63,5 +62,7 @@ class TestAdjustments(unittest.TestCase):
         self.assertEqual(inst.cleanup_interval, 1100)
         self.assertEqual(inst.channel_timeout, 1200)
         self.assertEqual(inst.log_socket_errors, True)
-        self.assertEqual(inst.verbose, False)
+
+    def test_badvar(self):
+        self.assertRaises(ValueError, self._makeOne, nope=True)
 
diff --git a/waitress/tests/test_init.py b/waitress/tests/test_init.py
index facc144..c1205de 100644
--- a/waitress/tests/test_init.py
+++ b/waitress/tests/test_init.py
@@ -8,7 +8,7 @@ class Test_serve(unittest.TestCase):
     def test_it(self):
         server = DummyServerFactory()
         app = object()
-        result = self._callFUT(app, _server=server)
+        result = self._callFUT(app, _server=server, _quiet=True)
         self.assertEqual(server.app, app)
         self.assertEqual(result, None)
         self.assertEqual(server.ran, True)
@@ -21,7 +21,7 @@ class Test_serve_paste(unittest.TestCase):
     def test_it(self):
         server = DummyServerFactory()
         app = object()
-        result = self._callFUT(app, _server=server)
+        result = self._callFUT(app, _server=server, _quiet=True)
         self.assertEqual(server.app, app)
         self.assertEqual(result, 0)
         self.assertEqual(server.ran, True)