remove compatibility code

cmccandless · cmccandless · commit 107e08564a0d · 2019-11-06T14:55:41.000-05:00
diff --git a/config/generator_macros.j2 b/config/generator_macros.j2
@@ -32,12 +32,6 @@ from {{ exercise | to_snake }} import ({% if imports -%}
 {%- endmacro %}
 
 {% macro utility() -%}# Utility functions
-    def setUp(self):
-        try:
-            self.assertRaisesRegex
-        except AttributeError:
-            self.assertRaisesRegex = self.assertRaisesRegexp
-
     def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
 {%- endmacro %}
diff --git a/exercises/affine-cipher/affine_cipher_test.py b/exercises/affine-cipher/affine_cipher_test.py
@@ -73,12 +73,6 @@ def test_decode_with_a_not_coprime_to_m(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
@@ -79,12 +79,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
@@ -47,12 +47,6 @@ def test_nothing_is_found_when_the_left_and_right_bounds_cross(self):
             find([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
@@ -200,12 +200,6 @@ def test_cannot_roll_after_bonus_rolls_for_strike(self):
             game.roll(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/change/change_test.py b/exercises/change/change_test.py
@@ -46,12 +46,6 @@ def test_cannot_find_negative_change_values(self):
             find_fewest_coins([1, 2, 5], -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
@@ -114,12 +114,6 @@ def test_initial_clear_does_not_affect_wrapping_around(self):
             buf.read()
 
     # 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
@@ -27,12 +27,6 @@ def test_negative_value_is_an_error(self):
             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
@@ -43,12 +43,6 @@ def test_returns_the_total_number_of_grains_on_the_board(self):
         self.assertEqual(total(), 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
@@ -38,12 +38,6 @@ def test_disallow_right_empty_strand(self):
             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
@@ -69,12 +69,6 @@ def test_euler_big_number(self):
         )
 
     # 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
@@ -302,12 +302,6 @@ def test_nonexistent_fifth_monday_of_february_2015(self):
             meetup(2015, 2, "5th", "Monday")
 
     # 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
@@ -64,12 +64,6 @@ def test_invalid_char(self):
             annotate(["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/nth-prime/nth_prime_test.py b/exercises/nth-prime/nth_prime_test.py
@@ -57,12 +57,6 @@ def test_first_twenty_primes(self):
         )
 
     # 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
@@ -68,12 +68,6 @@ def assertFactorsEqual(self, actual, expected):
         self.assertEqual(set(map(frozenset, actual)), set(map(frozenset, 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/perfect-numbers/perfect_numbers_test.py b/exercises/perfect-numbers/perfect_numbers_test.py
@@ -54,12 +54,6 @@ def test_negative_integer_is_rejected_not_a_natural_number(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
@@ -159,12 +159,6 @@ def assertTreeEquals(self, result, expected):
         self.assertEqual(result, expected, "{} != {}".format(result, 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/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
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/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
