]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
Add 'static_handler_args' application setting to pass extra keyword arguments 335/head
authorAlek Storm <alek.storm@gmail.com>
Wed, 17 Aug 2011 00:19:40 +0000 (00:19 +0000)
committerAlek Storm <alek.storm@gmail.com>
Wed, 17 Aug 2011 00:19:40 +0000 (00:19 +0000)
to static file handler constructor.

tornado/web.py

index 384b26eec409b4b1f2b6efd1b81e3b4fdf1f4912..94e72999cde4253460fb2f566763c295a503126a 100644 (file)
@@ -1199,12 +1199,12 @@ class Application(object):
                                              "/static/")
             static_handler_class = settings.get("static_handler_class",
                                                 StaticFileHandler)
-            handlers = [
-                (re.escape(static_url_prefix) + r"(.*)", static_handler_class,
-                 dict(path=path)),
-                (r"/(favicon\.ico)", static_handler_class, dict(path=path)),
-                (r"/(robots\.txt)", static_handler_class, dict(path=path)),
-            ] + handlers
+            static_handler_args = settings.get("static_handler_args", {})
+            static_handler_args['path'] = path
+            for pattern in [re.escape(static_url_prefix) + r"(.*)",
+                            r"/(favicon\.ico)", r"/(robots\.txt)"]:
+                handlers.insert(0, (pattern, static_handler_class,
+                                    static_handler_args))
         if handlers: self.add_handlers(".*$", handlers)
 
         # Automatically reload modified modules