intermediate changes

ref:cde9a383711a11544ce7e107a78147fb96cc4029

1 files changed, 21 insertions, 0 deletions

diff --git a/contrib/python/MarkupSafe/py2/tests/test_exception_custom_html.py b/contrib/python/MarkupSafe/py2/tests/test_exception_custom_html.py
new file mode 100644
index 00000000000..5f9ffde438d
--- /dev/null
+++ b/contrib/python/MarkupSafe/py2/tests/test_exception_custom_html.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+import pytest
+
+from markupsafe import escape
+
+
+class CustomHtmlThatRaises(object):
+    def __html__(self):
+        raise ValueError(123)
+
+
+def test_exception_custom_html():
+    """Checks whether exceptions in custom __html__ implementations are
+    propagated correctly.
+
+    There was a bug in the native implementation at some point:
+    https://github.com/pallets/markupsafe/issues/108
+    """
+    obj = CustomHtmlThatRaises()
+    with pytest.raises(ValueError):
+        escape(obj)