From e824ffda8a66d95aa259beb6f3a8e780636ee994 Mon Sep 17 00:00:00 2001 From: Ed Summers Date: Thu, 29 Jun 2023 16:57:44 -0400 Subject: [PATCH] pop_path_info This was removed in werkzeug 2.3 and exists as shift_pop_info in wsgiref: https://github.com/pallets/werkzeug/pull/2415 --- pywb/apps/frontendapp.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pywb/apps/frontendapp.py b/pywb/apps/frontendapp.py index a10c7a42..f3367e05 100644 --- a/pywb/apps/frontendapp.py +++ b/pywb/apps/frontendapp.py @@ -1,7 +1,7 @@ from gevent.monkey import patch_all; patch_all() from werkzeug.routing import Map, Rule, RequestRedirect, Submount -from werkzeug.wsgi import pop_path_info +from wsgiref.util import shift_path_info from six.moves.urllib.parse import urljoin, parse_qsl from six import iteritems from warcio.utils import to_native_str @@ -558,9 +558,9 @@ class FrontEndApp(object): return if coll != '$root': - pop_path_info(environ) + shift_path_info(environ) if record: - pop_path_info(environ) + shift_path_info(environ) paths = [self.warcserver.root_dir] @@ -669,7 +669,7 @@ class FrontEndApp(object): lang = args.pop('lang', self.default_locale) if lang: - pop_path_info(environ) + shift_path_info(environ) environ['pywb_lang'] = lang response = endpoint(environ, **args)