From 480768fc2ee3e9e29caf90cda9d160369f7787e7 Mon Sep 17 00:00:00 2001
From: Ed Summers <ehs@pobox.com>
Date: Tue, 11 Apr 2023 08:26:54 -0400
Subject: [PATCH] updated dependencies

---
 pywb/apps/rewriterapp.py     |  2 +-
 pywb/rewrite/templateview.py | 10 +++++-----
 requirements.txt             |  6 +++---
 test_requirements.txt        |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pywb/apps/rewriterapp.py b/pywb/apps/rewriterapp.py
index a0292732..59b7d0ea 100644
--- a/pywb/apps/rewriterapp.py
+++ b/pywb/apps/rewriterapp.py
@@ -64,7 +64,7 @@ class RewriterApp(object):
 
         if not jinja_env:
             jinja_env = JinjaEnv(globals={'static_path': 'static'},
-                                 extensions=['jinja2.ext.i18n', 'jinja2.ext.with_'])
+                                 extensions=['jinja2.ext.i18n'])
             jinja_env.jinja_env.install_null_translations()
 
         self.jinja_env = jinja_env
diff --git a/pywb/rewrite/templateview.py b/pywb/rewrite/templateview.py
index 7f0cbc88..39c76ee7 100644
--- a/pywb/rewrite/templateview.py
+++ b/pywb/rewrite/templateview.py
@@ -5,7 +5,7 @@ from pywb.utils.loaders import load
 
 from six.moves.urllib.parse import urlsplit, quote
 
-from jinja2 import Environment, TemplateNotFound, contextfunction, select_autoescape
+from jinja2 import Environment, TemplateNotFound, pass_context, select_autoescape
 from jinja2 import FileSystemLoader, PackageLoader, ChoiceLoader
 
 from webassets.ext.jinja2 import AssetsExtension
@@ -139,7 +139,7 @@ class JinjaEnv(object):
             return loc_map.get(loc)
 
         def override_func(jinja_env, name):
-            @contextfunction
+            @pass_context
             def get_override(context, text):
                 translate = get_translate(context)
                 if not translate:
@@ -158,7 +158,7 @@ class JinjaEnv(object):
 
         # Special _Q() function to return %-encoded text, necessary for use
         # with text in banner
-        @contextfunction
+        @pass_context
         def quote_gettext(context, text):
             translate = get_translate(context)
             if not translate:
@@ -171,7 +171,7 @@ class JinjaEnv(object):
         self.jinja_env.globals['_Q'] = quote_gettext
         self.jinja_env.globals['default_locale'] = default_locale
 
-        @contextfunction
+        @pass_context
         def switch_locale(context, locale):
             environ = context.get('env')
             curr_loc = environ.get('pywb_lang', '')
@@ -188,7 +188,7 @@ class JinjaEnv(object):
 
             return app_prefix + '/' + locale + request_uri
 
-        @contextfunction
+        @pass_context
         def get_locale_prefixes(context):
             environ = context.get('env')
             locale_prefixes = {}
diff --git a/requirements.txt b/requirements.txt
index 557bebfa..da8ba2ed 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,18 +2,18 @@ six
 warcio>=1.7.1
 requests
 redis<3.0
-jinja2<3.0.0
+jinja2
 surt>=0.3.1
 brotlipy
 pyyaml
 werkzeug
 webencodings
-gevent==21.12.0
+gevent
 webassets==2.0
 portalocker
 wsgiprox>=1.5.1
 fakeredis<1.0
 tldextract
 python-dateutil
-markupsafe<2.1.0
+markupsafe
 ua_parser
diff --git a/test_requirements.txt b/test_requirements.txt
index 972c8ca8..a1cc5057 100644
--- a/test_requirements.txt
+++ b/test_requirements.txt
@@ -3,7 +3,7 @@ WebTest
 pytest-cov
 mock
 urllib3
-httpbin==0.5.0
-flask<2.0
+httpbin
+flask
 ujson
 lxml