Skip to content

fix deprecation warnings #1161

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 3 commits into from
Jan 18, 2018
Merged

fix deprecation warnings #1161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b54bd8
fix deprecation warnings
cmccandless Jan 10, 2018
f7ac100
use simpler test for assertRaisesRegex existence
cmccandless Jan 18, 2018
9b3a201
Merge branch 'master' into fix-deprecation-warnings
Jan 18, 2018
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
4 changes: 2 additions & 2 deletions exercises/all-your-base/all_your_base_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ def test_both_bases_are_negative(self):
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand Down
4 changes: 2 additions & 2 deletions exercises/binary-search/binary_search_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ def test_empty_array(self):
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand Down
4 changes: 2 additions & 2 deletions exercises/binary/binary_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ def test_invalid_binary_text_with_numbers(self):
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand Down
4 changes: 2 additions & 2 deletions exercises/circular-buffer/circular_buffer_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,9 @@ def test_over_write_replaces_oldest_remaning_item(self):
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand Down
4 changes: 2 additions & 2 deletions exercises/error-handling/error_handling_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ def test_filelike_objects_are_closed_without_exception(self):
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand Down
36 changes: 18 additions & 18 deletions exercises/forth/forth_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ def test_errors_if_there_is_only_one_value_on_the_stack(self):
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand All @@ -69,9 +69,9 @@ def test_errors_if_there_is_only_one_value_on_the_stack(self):
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand All @@ -96,9 +96,9 @@ def test_errors_if_there_is_only_one_value_on_the_stack(self):
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand Down Expand Up @@ -133,9 +133,9 @@ def test_errors_if_there_is_only_one_value_on_the_stack(self):
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand Down Expand Up @@ -172,9 +172,9 @@ def test_errors_if_there_is_nothing_on_the_stack(self):
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand Down Expand Up @@ -204,9 +204,9 @@ def test_errors_if_there_is_nothing_on_the_stack(self):
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand Down Expand Up @@ -241,9 +241,9 @@ def test_errors_if_there_is_only_one_value_on_the_stack(self):
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand Down Expand Up @@ -278,9 +278,9 @@ def test_errors_if_there_is_only_one_value_on_the_stack(self):
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand Down Expand Up @@ -349,9 +349,9 @@ def test_errors_if_executing_a_non_existent_word(self):
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand Down
4 changes: 2 additions & 2 deletions exercises/grains/grains_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ def test_total(self):
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand Down
4 changes: 2 additions & 2 deletions exercises/hamming/hamming_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ def test_disallow_second_strand_longer(self):
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand Down
4 changes: 2 additions & 2 deletions exercises/hexadecimal/hexadecimal_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ def test_invalid_hexa(self):
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand Down
4 changes: 2 additions & 2 deletions exercises/largest-series-product/largest_series_product_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ def test_project_euler_big_number(self):
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand Down
4 changes: 2 additions & 2 deletions exercises/meetup/meetup_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,9 +405,9 @@ def test_nonexistent_fifth_monday_of_february_2015(self):
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand Down
4 changes: 2 additions & 2 deletions exercises/minesweeper/minesweeper_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,9 @@ def test_invalid_char(self):
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand Down
4 changes: 2 additions & 2 deletions exercises/nth-prime/nth_prime_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ def test_first_twenty_primes(self):
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand Down
4 changes: 2 additions & 2 deletions exercises/nucleotide-count/nucleotide_count_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ def test_counts_all_nucleotides(self):
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand Down
4 changes: 2 additions & 2 deletions exercises/ocr-numbers/ocr_numbers_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,9 @@ def test_recognizes_numbers_separated_by_empty_lines(self):
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand Down
4 changes: 2 additions & 2 deletions exercises/octal/octal_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ def test_valid_octal_formatted_string_011_is_decimal_9(self):
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand Down
4 changes: 2 additions & 2 deletions exercises/perfect-numbers/perfect_numbers_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ def test_negative(self):
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand Down
4 changes: 2 additions & 2 deletions exercises/phone-number/phone_number_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ def test_pretty_print_with_full_us_phone_number(self):
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand Down
4 changes: 2 additions & 2 deletions exercises/pov/pov_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,9 @@ def test_errors_if_source_does_not_exist(self):
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand Down
4 changes: 2 additions & 2 deletions exercises/protein-translation/protein_translation_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ def test_stops_translation_if_stop_codon_in_middle_of_six_codon_sequence(
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand Down
4 changes: 2 additions & 2 deletions exercises/pythagorean-triplet/pythagorean_triplet_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ def test_odd_number(self):
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand Down
4 changes: 2 additions & 2 deletions exercises/queen-attack/queen_attack_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ def test_board2(self):
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand Down
4 changes: 2 additions & 2 deletions exercises/rna-transcription/rna_transcription_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ def test_correctly_handles_partially_invalid_input(self):
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand Down
4 changes: 2 additions & 2 deletions exercises/saddle-points/saddle_points_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ def test_irregular_matrix(self):
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand Down
4 changes: 2 additions & 2 deletions exercises/say/say_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ def test_number_negative(self):
# Utility functions
def setUp(self):
try:
self.assertRaisesRegex = self.assertRaisesRegexp
self.assertRaisesRegex
except AttributeError:
pass
self.assertRaisesRegex = self.assertRaisesRegexp

def assertRaisesWithMessage(self, exception):
return self.assertRaisesRegex(exception, r".+")
Expand Down
Loading