PY2 repairs

Author: albu-diku

mig/shared/output.py

@@ -753,9 +753,9 @@ def html_format(configuration, ret_val, ret_msg, out_obj):
                 i['template_name'],
                 i['template_group'],
                 'html',
-                store.context.extend(**i['template_args'])
             )
-            lines.append(template.render())
+            bound = store.context.extend(template, i['template_args'])
+            lines.append(bound.render())
         elif i['object_type'] == 'error_text':
             msg = "%(text)s" % i
             if i.get('exc', False):

mig/shared/templates/__init__.py

@@ -52,11 +52,20 @@ def template_dirs():
     return _all_template_dirs
 
 
+class _BonundTemplate:
+    def __init__(self, template, template_args):
+        self.tmpl = template
+        self.args = template_args
+
+
+    def render(self):
+        return self.tmpl.render(**self.args)
+
+
 class _FormatContext:
     def __init__(self, configuration):
         self.output_format = None
         self.configuration = configuration
-        self.conf_map = ChainMap(configuration)
         self.script_map = {}
         self.style_map = {}
 
@@ -66,8 +75,8 @@ def __getitem__(self, key):
     def __iter__(self):
         return iter(self.__dict__)
 
-    def extend(self, **kwargs):
-        return ChainMap(kwargs, self)
+    def extend(self, template, template_args):
+        return _BonundTemplate(template, ChainMap(template_args, self))
 
 
 class TemplateStore:

requirements.txt

@@ -2,6 +2,8 @@
 # https://pip.pypa.io/en/stable/reference/requirement-specifiers/
 future
 
+chainmap;python_version < "3.3"
+
 # cgi was removed from the standard library in Python 3.13
 legacy-cgi;python_version >= "3.13"
 
@@ -26,7 +28,8 @@ email-validator;python_version >= "3.7"
 email-validator<2.0;python_version >= "3" and python_version < "3.7"
 email-validator<1.3;python_version < "3"
 
-jinja2
+jinja2<3;python_version < "3"
+jinja2;python_version >= "3.7"
 
 # NOTE: additional optional dependencies depending on site conf are listed
 #       in recommended.txt and can be installed in the same manner by pointing

tests/test_mig_shared_templates.py

@@ -1,11 +1,15 @@
-from __future__ import print_function
+import shutil
 
 from tests.support import MigTestCase, testmain
 
 from mig.shared.templates import TemplateStore, cache_dir, template_dirs
 
 
 class TestMigSharedTemplates(MigTestCase):
+    @classmethod
+    def tearDownClass(cls):
+        shutil.rmtree(cache_dir(), ignore_errors=True)
+
     def _provide_configuration(self):
         return 'testconfig'