Skip to content

refactor TestCase.assertRaisesRegexp #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 25, 2015
Merged

refactor TestCase.assertRaisesRegexp #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/mog_commons/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.1.7'
__version__ = '0.1.8'
7 changes: 5 additions & 2 deletions src/mog_commons/unittest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,11 @@ def assertRaisesRegexp(self, expected_exception, expected_regexp, callable_obj=N
with self.assertRaises(expected_exception) as cm:
callable_obj(*args, **kwargs)
if six.PY2:
# to avoid UnicodeEncodeError, use exception.message in Python2
msg = cm.exception.message or to_str(cm.exception, encoding)
try:
msg = to_str(cm.exception, encoding)
except UnicodeEncodeError:
# avoid to use cm.exception.message
msg = cm.exception.args[0]
self.assertRegexpMatches(msg, expected_regexp)
else:
self.assertRegex(to_str(cm.exception, encoding), expected_regexp)
Expand Down