remove compatibility code

cmccandless · cmccandless · commit 3b5d0a91f574 · 2019-04-15T09:44:52.000-04:00
diff --git a/exercises/affine-cipher/affine_cipher_test.py b/exercises/affine-cipher/affine_cipher_test.py
@@ -69,12 +69,6 @@ def test_decode_raises_meaningful_exception(self):
             decode("Test", 13, 5)
 
     # Utility functions
-    def setUp(self):
-        try:
-            self.assertRaisesRegex
-        except AttributeError:
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
 
diff --git a/exercises/all-your-base/all_your_base_test.py b/exercises/all-your-base/all_your_base_test.py
@@ -80,12 +80,6 @@ def test_both_bases_are_negative(self):
             rebase(-2, [1], -7)
 
     # Utility functions
-    def setUp(self):
-        try:
-            self.assertRaisesRegex
-        except AttributeError:
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
 
diff --git a/exercises/bank-account/bank_account_test.py b/exercises/bank-account/bank_account_test.py
@@ -139,12 +139,6 @@ def transact():
             thread.join()
 
     # Utility functions
-    def setUp(self):
-        try:
-            self.assertRaisesRegex
-        except AttributeError:
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
 
diff --git a/exercises/binary-search/binary_search_test.py b/exercises/binary-search/binary_search_test.py
@@ -49,12 +49,6 @@ def test_nothing_is_found_when_left_and_right_bounds_cross(self):
             binary_search([1, 2], 0)
 
     # Utility functions
-    def setUp(self):
-        try:
-            self.assertRaisesRegex
-        except AttributeError:
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
 
diff --git a/exercises/binary/binary_test.py b/exercises/binary/binary_test.py
@@ -48,12 +48,6 @@ def test_invalid_binary_text_with_numbers(self):
             parse_binary("nope10")
 
     # Utility functions
-    def setUp(self):
-        try:
-            self.assertRaisesRegex
-        except AttributeError:
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
 
diff --git a/exercises/bowling/bowling_test.py b/exercises/bowling/bowling_test.py
@@ -216,10 +216,6 @@ def test_cannot_roll_after_bonus_rolls_for_strike(self):
     # Utility functions
     def setUp(self):
         self.game = BowlingGame()
-        try:
-            self.assertRaisesRegex
-        except AttributeError:
-            self.assertRaisesRegex = self.assertRaisesRegexp
 
     def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
diff --git a/exercises/change/change_test.py b/exercises/change/change_test.py
@@ -49,12 +49,6 @@ def test_cannot_find_negative_change_values(self):
             find_minimum_coins(-5, [1, 2, 5])
 
     # Utility functions
-    def setUp(self):
-        try:
-            self.assertRaisesRegex
-        except AttributeError:
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
 
diff --git a/exercises/circular-buffer/circular_buffer_test.py b/exercises/circular-buffer/circular_buffer_test.py
@@ -104,12 +104,6 @@ def test_overwrite_replaces_oldest_remaining_item(self):
         self.assertEqual(buf.read(), '5')
 
     # Utility functions
-    def setUp(self):
-        try:
-            self.assertRaisesRegex
-        except AttributeError:
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
 
diff --git a/exercises/collatz-conjecture/collatz_conjecture_test.py b/exercises/collatz-conjecture/collatz_conjecture_test.py
@@ -28,12 +28,6 @@ def test_negative_number_is_invalid_input(self):
             collatz_steps(-15)
 
     # Utility functions
-    def setUp(self):
-        try:
-            self.assertRaisesRegex
-        except AttributeError:
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
 
diff --git a/exercises/dot-dsl/dot_dsl_test.py b/exercises/dot-dsl/dot_dsl_test.py
@@ -113,12 +113,6 @@ def test_unknown_item(self):
             ])
 
     # Utility methods
-    def setUp(self):
-        try:
-            self.assertRaisesRegex
-        except AttributeError:
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
 
diff --git a/exercises/error-handling/error_handling_test.py b/exercises/error-handling/error_handling_test.py
@@ -74,12 +74,6 @@ def test_filelike_objects_are_closed_without_exception(self):
                       'filelike_object should call do_something()')
 
     # Utility functions
-    def setUp(self):
-        try:
-            self.assertRaisesRegex
-        except AttributeError:
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
 
diff --git a/exercises/forth/forth_test.py b/exercises/forth/forth_test.py
@@ -7,12 +7,6 @@
 
 class ForthUtilities(unittest.TestCase):
     # Utility functions
-    def setUp(self):
-        try:
-            self.assertRaisesRegex
-        except AttributeError:
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
 
diff --git a/exercises/go-counting/go_counting_test.py b/exercises/go-counting/go_counting_test.py
@@ -85,12 +85,6 @@ def test_two_region_rectangular_board(self):
         self.assertSetEqual(territories[go_counting.NONE], set())
 
     # Utility functions
-    def setUp(self):
-        try:
-            self.assertRaisesRegex
-        except AttributeError:
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
 
diff --git a/exercises/grains/grains_test.py b/exercises/grains/grains_test.py
@@ -52,12 +52,6 @@ def test_total(self):
         self.assertEqual(total_after(64), 18446744073709551615)
 
     # Utility functions
-    def setUp(self):
-        try:
-            self.assertRaisesRegex
-        except AttributeError:
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
 
diff --git a/exercises/hamming/hamming_test.py b/exercises/hamming/hamming_test.py
@@ -39,12 +39,6 @@ def test_disallow_right_empty_strand(self):
             hamming.distance("G", "")
 
     # Utility functions
-    def setUp(self):
-        try:
-            self.assertRaisesRegex
-        except AttributeError:
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
 
diff --git a/exercises/hangman/hangman_test.py b/exercises/hangman/hangman_test.py
@@ -93,12 +93,6 @@ def test_winning_on_last_guess_still_counts_as_a_win(self):
         self.assertEqual(game.get_masked_word(), 'aaa')
 
     # Utility functions
-    def setUp(self):
-        try:
-            self.assertRaisesRegex
-        except AttributeError:
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
 
diff --git a/exercises/hexadecimal/hexadecimal_test.py b/exercises/hexadecimal/hexadecimal_test.py
@@ -39,12 +39,6 @@ def test_invalid_hexa(self):
             hexa('carrot')
 
     # Utility functions
-    def setUp(self):
-        try:
-            self.assertRaisesRegex
-        except AttributeError:
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
 
diff --git a/exercises/largest-series-product/largest_series_product_test.py b/exercises/largest-series-product/largest_series_product_test.py
@@ -88,12 +88,6 @@ def test_project_euler_big_number(self):
         self.assertEqual(largest_product(series, 13), 23514624000)
 
     # Utility functions
-    def setUp(self):
-        try:
-            self.assertRaisesRegex
-        except AttributeError:
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
 
diff --git a/exercises/meetup/meetup_test.py b/exercises/meetup/meetup_test.py
@@ -397,12 +397,6 @@ def test_nonexistent_fifth_monday_of_february_2015(self):
             meetup_day(2015, 2, 'Monday', '5th')
 
     # Utility functions
-    def setUp(self):
-        try:
-            self.assertRaisesRegex
-        except AttributeError:
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
 
diff --git a/exercises/minesweeper/minesweeper_test.py b/exercises/minesweeper/minesweeper_test.py
@@ -148,12 +148,6 @@ def test_invalid_char(self):
             board(inp)
 
     # Utility functions
-    def setUp(self):
-        try:
-            self.assertRaisesRegex
-        except AttributeError:
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
 
diff --git a/exercises/nth-prime/nth_prime_test.py b/exercises/nth-prime/nth_prime_test.py
@@ -29,12 +29,6 @@ def test_first_twenty_primes(self):
                          [nth_prime(n) for n in range(1, 21)])
 
     # Utility functions
-    def setUp(self):
-        try:
-            self.assertRaisesRegex
-        except AttributeError:
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
 
diff --git a/exercises/nucleotide-count/nucleotide_count_test.py b/exercises/nucleotide-count/nucleotide_count_test.py
@@ -38,12 +38,6 @@ def test_counts_all_nucleotides(self):
         self.assertEqual(nucleotide_counts(dna), expected)
 
     # Utility functions
-    def setUp(self):
-        try:
-            self.assertRaisesRegex
-        except AttributeError:
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
 
diff --git a/exercises/ocr-numbers/ocr_numbers_test.py b/exercises/ocr-numbers/ocr_numbers_test.py
@@ -138,12 +138,6 @@ def test_recognizes_numbers_separated_by_empty_lines(self):
         self.assertEqual(convert(input_grid), "123,456,789")
 
     # Utility functions
-    def setUp(self):
-        try:
-            self.assertRaisesRegex
-        except AttributeError:
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
 
diff --git a/exercises/octal/octal_test.py b/exercises/octal/octal_test.py
@@ -44,12 +44,6 @@ def test_valid_octal_formatted_string_011_is_decimal_9(self):
         self.assertEqual(parse_octal("011"), 9)
 
     # Utility functions
-    def setUp(self):
-        try:
-            self.assertRaisesRegex
-        except AttributeError:
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
 
diff --git a/exercises/palindrome-products/palindrome_products_test.py b/exercises/palindrome-products/palindrome_products_test.py
@@ -79,12 +79,6 @@ def test_error_for_largest_if_min_is_more_than_max(self):
             value, factors = largest_palindrome(min_factor=2, max_factor=1)
 
     # Utility functions
-    def setUp(self):
-        try:
-            self.assertRaisesRegex
-        except AttributeError:
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
 
diff --git a/exercises/perfect-numbers/perfect_numbers_test.py b/exercises/perfect-numbers/perfect_numbers_test.py
@@ -54,12 +54,6 @@ def test_negative(self):
             classify(-1)
 
     # Utility functions
-    def setUp(self):
-        try:
-            self.assertRaisesRegex
-        except AttributeError:
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
 
diff --git a/exercises/phone-number/phone_number_test.py b/exercises/phone-number/phone_number_test.py
@@ -92,12 +92,6 @@ def test_pretty_print_with_full_us_phone_number(self):
         self.assertEqual(number.pretty(), "(223) 456-7890")
 
     # Utility functions
-    def setUp(self):
-        try:
-            self.assertRaisesRegex
-        except AttributeError:
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
 
diff --git a/exercises/pov/pov_test.py b/exercises/pov/pov_test.py
@@ -204,12 +204,6 @@ def test_errors_if_source_does_not_exist(self):
             tree.path_to('nonexistent', 'x')
 
     # Utility functions
-    def setUp(self):
-        try:
-            self.assertRaisesRegex
-        except AttributeError:
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
 
diff --git a/exercises/queen-attack/queen_attack_test.py b/exercises/queen-attack/queen_attack_test.py
@@ -58,12 +58,6 @@ def test_queens_same_position_can_attack(self):
             Queen(2, 2).can_attack(Queen(2, 2))
 
     # Utility functions
-    def setUp(self):
-        try:
-            self.assertRaisesRegex
-        except AttributeError:
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
 
diff --git a/exercises/saddle-points/saddle_points_test.py b/exercises/saddle-points/saddle_points_test.py
@@ -63,12 +63,6 @@ def test_irregular_matrix(self):
             saddle_points(matrix)
 
     # Utility functions
-    def setUp(self):
-        try:
-            self.assertRaisesRegex
-        except AttributeError:
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
 
diff --git a/exercises/satellite/satellite_test.py b/exercises/satellite/satellite_test.py
diff --git a/exercises/say/say_test.py b/exercises/say/say_test.py
diff --git a/exercises/scale-generator/scale_generator_test.py b/exercises/scale-generator/scale_generator_test.py
diff --git a/exercises/series/series_test.py b/exercises/series/series_test.py
diff --git a/exercises/sgf-parsing/sgf_parsing_test.py b/exercises/sgf-parsing/sgf_parsing_test.py
diff --git a/exercises/simple-cipher/simple_cipher_test.py b/exercises/simple-cipher/simple_cipher_test.py
diff --git a/exercises/simple-linked-list/simple_linked_list_test.py b/exercises/simple-linked-list/simple_linked_list_test.py
diff --git a/exercises/tree-building/tree_building_test.py b/exercises/tree-building/tree_building_test.py
diff --git a/exercises/variable-length-quantity/variable_length_quantity_test.py b/exercises/variable-length-quantity/variable_length_quantity_test.py
diff --git a/exercises/wordy/wordy_test.py b/exercises/wordy/wordy_test.py
