From 44a1c605c480e4dedca87ecf68bdfcc217557a77 Mon Sep 17 00:00:00 2001
From: Jens Vagelpohl <jens@mineralware.com>
Date: Thu, 25 Apr 2019 09:21:40 -0500
Subject: [PATCH] - be more explicit when passing the encoding parameter

---
 src/DocumentTemplate/DT_In.py     |  8 ++++----
 src/DocumentTemplate/DT_Let.py    |  2 +-
 src/DocumentTemplate/DT_Raise.py  |  2 +-
 src/DocumentTemplate/DT_String.py |  3 ++-
 src/DocumentTemplate/DT_Try.py    | 10 +++++-----
 src/DocumentTemplate/DT_With.py   |  2 +-
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/DocumentTemplate/DT_In.py b/src/DocumentTemplate/DT_In.py
index 941c87e..76ad4ea 100644
--- a/src/DocumentTemplate/DT_In.py
+++ b/src/DocumentTemplate/DT_In.py
@@ -464,7 +464,7 @@ def renderwb(self, md):
 
         if not sequence:
             if self.elses:
-                return render_blocks(self.elses, md, self.encoding)
+                return render_blocks(self.elses, md, encoding=self.encoding)
             return ''
 
         if isinstance(sequence, str):
@@ -650,7 +650,7 @@ def renderwb(self, md):
                     if index == first:
                         pkw['sequence-start'] = 0
 
-                result = join_unicode(result, self.encoding)
+                result = join_unicode(result, encoding=self.encoding)
 
         finally:
             if cache:
@@ -672,7 +672,7 @@ def renderwob(self, md):
 
         if not sequence:
             if self.elses:
-                return render_blocks(self.elses, md, self.encoding)
+                return render_blocks(self.elses, md, encoding=self.encoding)
             return ''
 
         if isinstance(sequence, str):
@@ -762,7 +762,7 @@ def renderwob(self, md):
                 if index == 0:
                     pkw['sequence-start'] = 0
 
-            result = join_unicode(result, self.encoding)
+            result = join_unicode(result, encoding=self.encoding)
 
         finally:
             if cache:
diff --git a/src/DocumentTemplate/DT_Let.py b/src/DocumentTemplate/DT_Let.py
index b224c78..320e6e2 100644
--- a/src/DocumentTemplate/DT_Let.py
+++ b/src/DocumentTemplate/DT_Let.py
@@ -82,7 +82,7 @@ def render(self, md):
                     d[name] = md[expr]
                 else:
                     d[name] = expr(md)
-            return render_blocks(self.section, md, self.encoding)
+            return render_blocks(self.section, md, encoding=self.encoding)
         finally:
             md._pop(1)
 
diff --git a/src/DocumentTemplate/DT_Raise.py b/src/DocumentTemplate/DT_Raise.py
index ca37a2a..178e19c 100644
--- a/src/DocumentTemplate/DT_Raise.py
+++ b/src/DocumentTemplate/DT_Raise.py
@@ -64,7 +64,7 @@ def render(self, md):
                     t = InvalidErrorTypeExpression
 
         try:
-            v = render_blocks(self.section, md, self.encoding)
+            v = render_blocks(self.section, md, encoding=self.encoding)
         except Exception:
             v = 'Invalid Error Value'
 
diff --git a/src/DocumentTemplate/DT_String.py b/src/DocumentTemplate/DT_String.py
index db0b7a5..18efc10 100644
--- a/src/DocumentTemplate/DT_String.py
+++ b/src/DocumentTemplate/DT_String.py
@@ -517,7 +517,8 @@ def __call__(self, client=None, mapping={}, **kw):
             value = self.ZDocumentTemplate_beforeRender(md, _marker)
             if value is _marker:
                 try:
-                    result = render_blocks(self._v_blocks, md, self.encoding)
+                    result = render_blocks(self._v_blocks, md,
+                                           encoding=self.encoding)
                 except DTReturn as v:
                     result = v.v
                 self.ZDocumentTemplate_afterRender(md, result)
diff --git a/src/DocumentTemplate/DT_Try.py b/src/DocumentTemplate/DT_Try.py
index d1a0fda..858cbe4 100644
--- a/src/DocumentTemplate/DT_Try.py
+++ b/src/DocumentTemplate/DT_Try.py
@@ -149,7 +149,7 @@ def render_try_except(self, md):
 
         # first we try to render the first block
         try:
-            result = render_blocks(self.section, md, self.encoding)
+            result = render_blocks(self.section, md, encoding=self.encoding)
         except DTReturn:
             raise
         except Exception:
@@ -171,7 +171,7 @@ def render_try_except(self, md):
                 ns = namespace(md, error_type=errname, error_value=v,
                                error_tb=error_tb)[0]
                 md._push(InstanceDict(ns, md))
-                return render_blocks(handler, md, self.encoding)
+                return render_blocks(handler, md, encoding=self.encoding)
             finally:
                 md._pop(1)
 
@@ -181,17 +181,17 @@ def render_try_except(self, md):
                 return result
             else:
                 return result + render_blocks(self.elseBlock, md,
-                                              self.encoding)
+                                              encoding=self.encoding)
 
     def render_try_finally(self, md):
         result = ''
         # first try to render the first block
         try:
-            result = render_blocks(self.section, md, self.encoding)
+            result = render_blocks(self.section, md, encoding=self.encoding)
         # Then handle finally block
         finally:
             result = result + render_blocks(self.finallyBlock, md,
-                                            self.encoding)
+                                            encoding=self.encoding)
         return result
 
     def find_handler(self, exception):
diff --git a/src/DocumentTemplate/DT_With.py b/src/DocumentTemplate/DT_With.py
index 8aa40c9..b2cbdef 100644
--- a/src/DocumentTemplate/DT_With.py
+++ b/src/DocumentTemplate/DT_With.py
@@ -82,7 +82,7 @@ def render(self, md):
 
         md._push(v)
         try:
-            return render_blocks(self.section, md, self.encoding)
+            return render_blocks(self.section, md, encoding=self.encoding)
         finally:
             md._pop(1)