Updated code to match the new version of Jinja2 + bumped django-scien…

…tific-survey
dkalpakchi · Feb 4, 2024 · 1dba3d3 · 1dba3d3
1 parent c832aea
commit 1dba3d3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Textinator/Textinator/__init__.py b/Textinator/Textinator/__init__.py
@@ -3,5 +3,5 @@
 
 __all__ = ('celery_app',)
 
-__version__ = '1.3.5'
+__version__ = '1.3.7'
 VERSION = __version__  # synonym
diff --git a/Textinator/Textinator/jinja2.py b/Textinator/Textinator/jinja2.py
@@ -13,7 +13,8 @@
 from django.template.loader import get_template
 
 
-from jinja2 import Environment, Template, Markup
+from jinja2 import Environment, Template
+from markupsafe import Markup
 
 
 INSIDE_PROJECT_RE = re.compile(r"/projects/\d+/?$")
@@ -169,7 +170,6 @@ def strip(x):
 def environment(**options):
     extensions = [] if 'extensions' not in options else options['extensions']
     extensions.append('jinja2.ext.i18n')
-    extensions.append('jinja2.ext.with_')
     options['extensions'] = extensions
     options['autoescape'] = True
     env = Environment(**options)

diff --git a/Textinator/requirements.txt b/Textinator/requirements.txt
@@ -12,7 +12,7 @@ django-modeltranslation==0.17.3
 django-nested-admin==3.3.3
 django-registration==3.1.2
 django-rosetta==0.9.8
-django-scientific-survey==0.3.3
+django-scientific-survey==0.3.4
 django-tinymce4-lite==1.8.0
 django_admin_rangefilter==0.6.1
 django_filebrowser_no_grappelli==3.8.0