Merge pull request #56 from w3c/handlers_class_fixup

fixup! Eliminate constructs that prevent passing routes across processes...

Author: jgraham

wptserve/handlers.py

@@ -223,11 +223,10 @@ def __call__(self, request, response):
 python_script_handler = PythonScriptHandler()
 
 class FunctionHandler(object):
-    def __call__(self, func):
+    def __init__(self, func):
         self.func = func
-        return self.handle_request
 
-    def handle_request(self, request, response):
+    def __call__(self, request, response):
         try:
             rv = self.func(request, response)
         except Exception:
@@ -250,13 +249,15 @@ def handle_request(self, request, response):
 
 #The generic name here is so that this can be used as a decorator
 def handler(func):
-    return FunctionHandler()(func)
+    return FunctionHandler(func)
 
 
 class JsonHandler(object):
-    def __call__(self, func):
+    def __init__(self, func):
         self.func = func
-        return FunctionHandler(self.handle_request)
+
+    def __call__(self, request, response):
+        return FunctionHandler(self.handle_request)(request, response)
 
     def handle_request(self, request, response):
         rv = self.func(request, response)
@@ -273,7 +274,7 @@ def handle_request(self, request, response):
         return value
 
 def json_handler(func):
-    return JsonHandler()(func)
+    return JsonHandler(func)
 
 class AsIsHandler(object):
     def __init__(self, base_path=None, url_base="/"):

wptserve/server.py

@@ -253,7 +253,7 @@ def handle_one_request(self):
                         err = [e.message]
                     else:
                         err = []
-                        err.append(traceback.format_exc())
+                    err.append(traceback.format_exc())
                     response.set_error(500, "\n".join(err))
             self.logger.debug("%i %s %s (%s) %i" % (response.status[0],
                                                     request.method,