Use unicode message if regex is also unicode in ExceptionInfo.match

pytest-dev · Jun 30, 2019 · 09dee29 · 09dee29
1 parent 86a4eb6
commit 09dee29
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/_pytest/_code/code.py b/src/_pytest/_code/code.py
@@ -572,9 +572,13 @@ def match(self, regexp):
         raised.
         """
         __tracebackhide__ = True
-        value = safe_str(self.value)
+        value = (
+            text_type(self.value) if isinstance(regexp, text_type) else str(self.value)
+        )
         if not re.search(regexp, value):
-            assert 0, "Pattern '{!s}' not found in '{!s}'".format(regexp, value)
+            raise AssertionError(
+                "Pattern '{!s}' not found in '{!s}'".format(regexp, value)
+            )
         return True
 
 

diff --git a/testing/python/raises.py b/testing/python/raises.py
@@ -279,6 +279,8 @@ def __class__(self):
                     pass
             assert "via __class__" in excinfo.value.args[0]
 
-    def test_u(self):
+    def test_unicode_message(self):
+        """pytest.raises should be able to match unicode messages when using a unicode regex (#5478)
+        """
         with pytest.raises(AssertionError, match=u"\u2603"):
             assert False, u"\u2603"