commit e1b6f97daedcfab29c1139ddb8c41292cd7de472
author R David Murray <rdmurray@bitdance.com> Sun Mar 23 15:08:43 2014 -0400
committer R David Murray <rdmurray@bitdance.com> Sun Mar 23 15:08:43 2014 -0400
tree 580920419e1db0b677444a7fb33201d44f32b114
parent 91e7f04fc55523b339209dc6fb7702d3cf6bade4

#20145: assert[Raises|Warns]Regex now raise TypeError on bad regex.

Previously a non-string, non-regex second argument could cause the test
to always pass.

Initial patch by Kamilla Holanda.

Lib/unittest/case.py

diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index 87fb02b..bedbc67 100644
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -143,7 +143,7 @@
                 self.obj_name = str(callable_obj)
         else:
             self.obj_name = None
-        if isinstance(expected_regex, (bytes, str)):
+        if expected_regex is not None:
             expected_regex = re.compile(expected_regex)
         self.expected_regex = expected_regex
         self.msg = None