Issue 3112 - Support use of sitescripts URL handlers from the test server

cms/bin/test_server.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2015 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
@@ skipping 85 matching lines @@
   mime = "text/html; encoding=%s" % UNICODE_ENCODING
   start_response(status, [("Content-Type", mime)])
   for fragment in template.stream(status=status, **kwargs):
     yield fragment.encode(UNICODE_ENCODING)
 
 def handler(environ, start_response):
   path = environ.get("PATH_INFO")
 
   # First check for a relevant URL handler in sitescripts
   try:
     from sitescripts.web import get_handler

[Sebastian Noack, 2015/09/29 11:45:30]

I'm not too happy with this change. I don't think that sitescript specific hacks
belong into the generic CMS code. I'd rather make the handler function(s)
configurable in settings.ini.

-    return get_handler(path)(environ, start_response)
+    dynamic_handler = get_handler(path)
   except (KeyError, ImportError):
     pass
+  else:
+    return dynamic_handler(environ, start_response)
 
   # Otherwise serve a static file / page
   data = get_data(path)
   if data is None:
     return show_error(start_response, "404 Not Found", uri=path)
 
   mime = mimetypes.guess_type(path)[0] or "text/html"
 
   if isinstance(data, unicode):
     data = data.encode(UNICODE_ENCODING)
@@ skipping 40 matching lines @@
           return app(environ, start_response)
         except Exception, e:
           return show_error(start_response, "500 Internal Server Error",
               uri=environ.get("PATH_INFO"), error=e)
 
       server = make_server(host, port, wrapper, ThreadedWSGIServer)
       print " * Running on http://%s:%i/" % server.server_address
       server.serve_forever()
 
   run("localhost", 5000, handler, use_reloader=True, use_debugger=True)