From 8b6eb6d5ca9eba0f82a9f77c8fb8dbc980c5f4f8 Mon Sep 17 00:00:00 2001 From: Ilya Kreymer Date: Thu, 4 Jan 2018 15:56:07 -0800 Subject: [PATCH] warcserver: routing: use werkzeug default rule instead of 'path:' (currently used for single path segments anyway), fixes issues with werkzeug 0.14, fixes #271 --- pywb/warcserver/basewarcserver.py | 4 ++-- pywb/warcserver/warcserver.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pywb/warcserver/basewarcserver.py b/pywb/warcserver/basewarcserver.py index c9aa8819..e1d2fdfb 100644 --- a/pywb/warcserver/basewarcserver.py +++ b/pywb/warcserver/basewarcserver.py @@ -44,10 +44,10 @@ class BaseWarcServer(object): return handler(params) self.url_map.add(Rule(path, endpoint=direct_input_request)) - self.url_map.add(Rule(path + '/', endpoint=direct_input_request)) + self.url_map.add(Rule(path + '/', endpoint=direct_input_request)) self.url_map.add(Rule(path + '/postreq', endpoint=post_fullrequest)) - self.url_map.add(Rule(path + '//postreq', endpoint=post_fullrequest)) + self.url_map.add(Rule(path + '//postreq', endpoint=post_fullrequest)) handler_dict = handler.get_supported_modes() diff --git a/pywb/warcserver/warcserver.py b/pywb/warcserver/warcserver.py index 993f9b6c..9f9233d1 100644 --- a/pywb/warcserver/warcserver.py +++ b/pywb/warcserver/warcserver.py @@ -74,7 +74,7 @@ class WarcServer(BaseWarcServer): self.add_route('/' + name, route) if self.auto_handler: - self.add_route('/', self.auto_handler, path_param_name='param.coll') + self.add_route('/', self.auto_handler, path_param_name='param.coll') def init_paths(self, name, abs_path=None): templ = self.config.get(name)