Renamed error_middleware to errormiddleware; added middleware configuration value; created makeapp with helper functions; refactored server.py to be a bit simpler; consolidated some pyconfig methods

1 files changed, 6 insertions, 18 deletions

diff --git a/paste/webkit/conf_setup.py b/paste/webkit/conf_setup.py
index 1599997..656bea6 100644
--- a/paste/webkit/conf_setup.py
+++ b/paste/webkit/conf_setup.py
@@ -1,11 +1,10 @@
 import sys
 import os
+from paste import makeapp
 from paste import urlparser
 from paste import session
 from paste import recursive
 from paste import httpexceptions
-from paste import lint
-from paste import error_middleware
 
 def build_application(conf):
     if not 'publish_dir' in conf:
@@ -13,25 +12,14 @@ def build_application(conf):
         sys.exit(2)
     directory = conf['publish_dir']
     install_fake_webware = conf.get('install_fake_webware', True)
-    use_lint = conf.get('lint', False)
     if install_fake_webware:
         _install_fake_webware()
     app = urlparser.URLParser(directory, os.path.basename(directory))
-    if use_lint:
-        app = lint.middleware(app)
-    app = httpexceptions.middleware(app)
-    if use_lint:
-        app = lint.middleware(app)
-    print session
-    app = session.SessionMiddleware(app)
-    if use_lint:
-        app = lint.middleware(app)
-    app = recursive.RecursiveMiddleware(app)
-    if use_lint:
-        app = lint.middleware(app)
-    app = error_middleware.ErrorMiddleware(app)
-    # I'll skip the use of lint on recursive, because it doesn't modify
-    # its output much at all
+    app = makeapp.apply_conf_middleware(
+        app, conf,
+        [httpexceptions.middleware, session.SessionMiddleware,
+         recursive.RecursiveMiddleware])
+    app = makeapp.apply_default_middleware(app, conf)
     return app
 
 def install_fake_webware():