diff --git a/.gitignore b/.gitignore index 8897b875..990c192d 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ local/ parts/ var/ src/ +/pip-selfcheck.json diff --git a/CHANGES.rst b/CHANGES.rst index 8ea64eff..a8dae514 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,8 @@ Changelog ------------------ Bug fixes: +- Catch errors on resolving tiles and return an error message instead of breaking the whole UI + [MrTango] - Fix issue where layout aware tile data storage read cache was not purged when data was updated programmatically [fixes #75] diff --git a/buildout.cfg b/buildout.cfg index 9960ae37..8ef20284 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -1,6 +1,6 @@ [buildout] extends = - test-x.x.x.cfg + test-5.2.x.cfg package-name = plone.app.blocks package-extras = [test] diff --git a/plone/app/blocks/tests/test_tiles.py b/plone/app/blocks/tests/test_tiles.py index 219e8ce1..f245434c 100644 --- a/plone/app/blocks/tests/test_tiles.py +++ b/plone/app/blocks/tests/test_tiles.py @@ -13,6 +13,13 @@ import unittest +try: + # Python 2: "unicode" is built-in + unicode +except NameError: + unicode = str + + class ITestTile(Interface): magicNumber = schema.Int(title=u"Magic number", required=False) @@ -35,6 +42,7 @@ def __call__(self):
Magic number: %(number)d; Form: %(form)s; Query string: %(queryString)s; URL: %(url)s + Umlauts: Übertile ;)