Fix SyntaxWarnings in Python 3.8 resulting from comparing literals wi…

…th 'is' See plone/Products.CMFPlone#2890
starzel · Jun 21, 2019 · 3e36546 · 3e36546
1 parent 983877e
commit 3e36546
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,7 +4,8 @@ Changes
 3.7 (unreleased)
 ----------------
 
-...
+- Fix SyntaxWarnings in Python 3.8 resulting from comparing literals with 'is'.
+  See https://github.com/plone/Products.CMFPlone/issues/2890.
 
 3.6.1 (2019-04-01)
 ------------------

diff --git a/src/chameleon/compiler.py b/src/chameleon/compiler.py
@@ -147,7 +147,7 @@ def eval_token(token):
 emit_bool = template(is_func=True,
                      func_args=('target', 's', 'default_marker', 'default'),
                      func_defaults=(None, None), source=r"""
-    if target is default_marker:
+    if target == default_marker:
         target = default
     elif target:
         target = s
@@ -163,7 +163,7 @@ def eval_token(token):
                         source=r"""
     if target is None:
         pass
-    elif target is default_marker:
+    elif target == default_marker:
         target = default
     else:
         __tt = type(target)
@@ -216,8 +216,8 @@ def func(target):
                           'default'),
                           func_defaults=(None,),
                           source=r"""
-    target = translate(msgid, default=default, domain=__i18n_domain, 
-                       context=__i18n_context, 
+    target = translate(msgid, default=default, domain=__i18n_domain,
+                       context=__i18n_context,
                        target_language=target_language)""")
 
 
@@ -230,7 +230,7 @@ def func(target, quote, quote_entity, default, default_marker):
         if target is None:
             return
 
-        if target is default_marker:
+        if target == default_marker:
             return default
 
         __tt = type(target)