Merge 03b48b4 into 299e0ec

zopefoundation · Jun 29, 2022 · 263ff6e · 263ff6e
2 parents 299e0ec + 03b48b4
commit 263ff6e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -10,6 +10,8 @@ https://github.com/zopefoundation/Zope/blob/4.x/CHANGES.rst
 5.5.3 (unreleased)
 ------------------
 
+- Make Products.PageTemplate engine compatible with Chameleon 3.10.
+
 - Update to newest compatible versions of dependencies.
 
 

diff --git a/src/Products/PageTemplates/engine.py b/src/Products/PageTemplates/engine.py
@@ -196,7 +196,7 @@ def vars(self):
     def getValue(self, name, default=None):
         try:
             return self._c_context[name]
-        except NameError:
+        except (NameError, KeyError):
             return default
 
     get = getValue

diff --git a/versions-prod.cfg b/versions-prod.cfg
@@ -8,7 +8,7 @@ AccessControl = 5.3.1
 Acquisition = 4.10
 AuthEncoding = 4.3
 BTrees = 4.10.0
-Chameleon = 3.9.1
+Chameleon = 3.10.1
 DateTime = 4.4
 DocumentTemplate = 4.0
 ExtensionClass = 4.6

diff --git a/versions.cfg b/versions.cfg
@@ -14,8 +14,7 @@ alabaster = 0.7.12
 beautifulsoup4 = 4.11.1
 certifi = 2022.6.15
 cffi = 1.15.0
-# requests 2.28 requires charset-normalizer 2.0.x
-charset-normalizer = 2.0.12
+charset-normalizer = 2.1.0
 collective.recipe.template = 2.2
 # sphinx-rtd-theme 1.0.0 requires docutils <0.18
 docutils = 0.17.1
@@ -25,7 +24,7 @@ mr.developer = 2.0.1
 plone.recipe.command = 1.1
 pycparser = 2.21
 python-gettext = 4.0
-requests = 2.28.0
+requests = 2.28.1
 snowballstemmer = 2.2.0
 soupsieve = 2.3.2.post1
 sphinx-rtd-theme = 1.0.0