From 67f29fdb2b614925bd3e067d15e929595aee89ec Mon Sep 17 00:00:00 2001 From: Eric Amador Date: Sat, 18 Apr 2015 00:42:54 -0400 Subject: [PATCH] Use assertRaisesRegex when available. --- analytical/tests/test_utils.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/analytical/tests/test_utils.py b/analytical/tests/test_utils.py index 53f59d5..5f6b3e6 100644 --- a/analytical/tests/test_utils.py +++ b/analytical/tests/test_utils.py @@ -19,8 +19,13 @@ class SettingDeletedTestCase(TestCase): """ Make sure using get_required_setting fails in the right place. """ - # only available in python >= 2.7 - if hasattr(self, 'assertRaisesRegexp'): + + # available in python >= 3.2 + if hasattr(self, 'assertRaisesRegex'): + with self.assertRaisesRegex(AnalyticalException, "^USER_ID setting is set to None$"): + user_id = get_required_setting("USER_ID", "\d+", "invalid USER_ID") + # available in python >= 2.7, deprecated in 3.2 + elif hasattr(self, 'assertRaisesRegexp'): with self.assertRaisesRegexp(AnalyticalException, "^USER_ID setting is set to None$"): user_id = get_required_setting("USER_ID", "\d+", "invalid USER_ID") else: