Modernise some uses of assertRaises.

Trundle · Trundle · commit f695068c9862 · 2015-02-17T23:08:27.000+01:00
diff --git a/bpython/test/test_autocomplete.py b/bpython/test/test_autocomplete.py
@@ -19,8 +19,8 @@
 
 class TestSafeEval(unittest.TestCase):
     def test_catches_syntax_error(self):
-        self.assertRaises(autocomplete.EvaluationError,
-                          autocomplete.safe_eval, '1re', {})
+        with self.assertRaises(autocomplete.EvaluationError):
+            autocomplete.safe_eval('1re', {})
 
 
 class TestFormatters(unittest.TestCase):
diff --git a/bpython/test/test_keys.py b/bpython/test/test_keys.py
@@ -32,10 +32,9 @@ def test_keymap_getitem(self):
 
     def test_keymap_keyerror(self):
         """Verify keys.KeyMap raising KeyError when getting undefined key"""
-        def raiser():
+        with self.assertRaises(KeyError):
             keys.cli_key_dispatch['C-asdf']
             keys.cli_key_dispatch['C-qwerty']
-        self.assertRaises(KeyError, raiser)
 
 
 class TestUrwidKeys(unittest.TestCase):
@@ -64,10 +63,9 @@ def test_keymap_getitem(self):
 
     def test_keymap_keyerror(self):
         """Verify keys.KeyMap raising KeyError when getting undefined key"""
-        def raiser():
+        with self.assertRaises(KeyError):
             keys.urwid_key_dispatch['C-asdf']
             keys.urwid_key_dispatch['C-qwerty']
-        self.assertRaises(KeyError, raiser)
 
 
 if __name__ == '__main__':
diff --git a/bpython/test/test_manual_readline.py b/bpython/test/test_manual_readline.py
@@ -239,20 +239,26 @@ def test_seq(self):
         self.assertEqual(self.edits['a'], f)
         self.assertEqual(self.edits.call('a', cursor_offset=3, line='hello'),
                          ('hi', 2))
-        self.assertRaises(KeyError, self.edits.__getitem__, 'b')
-        self.assertRaises(KeyError, self.edits.call, 'b')
+        with self.assertRaises(KeyError):
+            self.edits['b']
+        with self.assertRaises(KeyError):
+            self.edits.call('b')
 
     def test_functions_with_bad_signatures(self):
         f = lambda something: (1, 2)
-        self.assertRaises(TypeError, self.edits.add, 'a', f)
+        with self.assertRaises(TypeError):
+            self.edits.add('a', f)
         g = lambda cursor_offset, line, something, something_else: (1, 2)
-        self.assertRaises(TypeError, self.edits.add, 'a', g)
+        with self.assertRaises(TypeError):
+            self.edits.add('a', g)
 
     def test_functions_with_bad_return_values(self):
         f = lambda cursor_offset, line: ('hi',)
-        self.assertRaises(ValueError, self.edits.add, 'a', f)
+        with self.assertRaises(ValueError):
+            self.edits.add('a', f)
         g = lambda cursor_offset, line: ('hi', 1, 2, 3)
-        self.assertRaises(ValueError, self.edits.add, 'b', g)
+        with self.assertRaises(ValueError):
+            self.edits.add('b', g)
 
     def test_config(self):
         f = lambda cursor_offset, line: ('hi', 2)
@@ -267,10 +273,10 @@ class config(object):
         configured_edits = self.edits.mapping_with_config(config, key_dispatch)
         self.assertTrue(configured_edits.__contains__, 'c')
         self.assertNotIn('c', self.edits)
-        self.assertRaises(NotImplementedError,
-                          configured_edits.add_config_attr, 'att2', g)
-        self.assertRaises(NotImplementedError,
-                          configured_edits.add, 'd', g)
+        with self.assertRaises(NotImplementedError):
+            configured_edits.add_config_attr('att2', g)
+        with self.assertRaises(NotImplementedError):
+            configured_edits.add('d', g)
         self.assertEqual(configured_edits.call('c', cursor_offset=5,
                                                line='asfd'),
                          ('hi', 2))
diff --git a/bpython/test/test_repl.py b/bpython/test/test_repl.py
@@ -88,7 +88,8 @@ def test_iter(self):
         self.assertEqual(list(slice), self.matches * 3)
 
     def test_current(self):
-        self.assertRaises(ValueError, self.matches_iterator.current)
+        with self.assertRaises(ValueError):
+            self.matches_iterator.current()
         next(self.matches_iterator)
         self.assertEqual(self.matches_iterator.current(), self.matches[0])
 
@@ -113,7 +114,8 @@ def test_cur_line(self):
             self.matches_iterator.orig_line)
         self.matches_iterator.completer = completer
 
-        self.assertRaises(ValueError, self.matches_iterator.cur_line)
+        with self.assertRaises(ValueError):
+            self.matches_iterator.cur_line()
 
         self.assertEqual(next(self.matches_iterator), self.matches[0])
         self.assertEqual(self.matches_iterator.cur_line(),
@@ -215,8 +217,8 @@ def set_input_line(self, line):
 
     def assert_get_source_error_for_current_function(self, func, msg):
         self.repl.current_func = func
-        self.assertRaises(repl.SourceNotFound,
-                          self.repl.get_source_of_current_name)
+        with self.assertRaises(repl.SourceNotFound):
+            self.repl.get_source_of_current_name()
         try:
             self.repl.get_source_of_current_name()
         except repl.SourceNotFound as e:
