Add 'make_server()' convenience factory, and tests for simple_server and

validate modules.


git-svn-id: svn://svn.eby-sarna.com/svnroot/wsgiref@2170 571e12c6-e1fa-0310-aee7-ff1267fa46bd

1 files changed, 12 insertions, 12 deletions

diff --git a/wsgiref/simple_server.py b/wsgiref/simple_server.py
index d226359..e171686 100644
--- a/wsgiref/simple_server.py
+++ b/wsgiref/simple_server.py
@@ -15,7 +15,7 @@ import urllib, sys
 from wsgiref.handlers import SimpleHandler
 
 __version__ = "0.1"
-__all__ = ['WSGIServer','WSGIRequestHandler','demo_app']
+__all__ = ['WSGIServer', 'WSGIRequestHandler', 'demo_app', 'make_server']
 
 
 server_version = "WSGIServer/" + __version__
@@ -35,7 +35,7 @@ class ServerHandler(SimpleHandler):
         finally:
             SimpleHandler.close(self)
 
-        
+
 
 
 
@@ -174,10 +174,18 @@ def demo_app(environ,start_response):
     return [stdout.getvalue()]
 
 
+def make_server(
+    host, port, app, server_class=WSGIServer, handler_class=WSGIRequestHandler
+):
+    """Create a new WSGI server listening on `host` and `port` for `app`"""
+    server = server_class((host, port), handler_class)
+    server.set_app(app)
+    return server
+
+
 if __name__ == '__main__':
     server_address = ('', 8000)
-    httpd = WSGIServer(server_address, WSGIRequestHandler)
-    httpd.set_app(demo_app)
+    httpd = make_server('', 8000, demo_app)
     sa = httpd.socket.getsockname()
     print "Serving HTTP on", sa[0], "port", sa[1], "..."
     import webbrowser
@@ -195,11 +203,3 @@ if __name__ == '__main__':
 
 
 
-
-
-
-
-
-
-
-