Skip to content

Commit

Permalink
Replace rest of deprecated self.assertRaisesRegexp methods
Browse files Browse the repository at this point in the history
  • Loading branch information
mccwdev committed Dec 14, 2023
1 parent 1d03dc2 commit 4cd0b08
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion tests/test_db.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def test_database_upgrade(self):
def test_database_create_drop(self):
dbtmp = Db(DATABASEFILE_TMP)
Wallet.create("tmpwallet", db_uri=DATABASEFILE_TMP)
self.assertRaisesRegexp(WalletError, "Wallet with name 'tmpwallet' already exists",
self.assertRaisesRegex(WalletError, "Wallet with name 'tmpwallet' already exists",
Wallet.create, 'tmpwallet', db_uri=DATABASEFILE_TMP)
dbtmp.drop_db(yes_i_am_sure=True)
Wallet.create("tmpwallet", db_uri=DATABASEFILE_TMP)
Expand Down
16 changes: 8 additions & 8 deletions tests/test_encoding.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,21 +113,21 @@ def test_change_base_bytes_as_string(self):
self.assertEqual('c8e90996c7c6080ee06284600c684ed904d14c5c', change_base(s, 256, 16))

def test_change_base_decimal_input_lenght_exception(self):
self.assertRaisesRegexp(EncodingError, "For a decimal input a minimum output length is required",
self.assertRaisesRegex(EncodingError, "For a decimal input a minimum output length is required",
change_base, 100, 10, 2)

def test_encoding_exceptions(self):
self.assertRaisesRegexp(EncodingError, "Unknown input format {}",
self.assertRaisesRegex(EncodingError, "Unknown input format {}",
change_base, {}, 4, 2)
self.assertRaisesRegexp(EncodingError, "Byteint must be a list or defined as bytes",
self.assertRaisesRegex(EncodingError, "Byteint must be a list or defined as bytes",
varbyteint_to_int, 'fd1027')
self.assertRaisesRegexp(EncodingError, "Input must be a number type",
self.assertRaisesRegex(EncodingError, "Input must be a number type",
int_to_varbyteint, '1000')
self.assertRaisesRegexp(TypeError, "String value expected", normalize_string, 100)
self.assertRaisesRegexp(EncodingError, "Encoding base32 not supported", pubkeyhash_to_addr, '123',
self.assertRaisesRegex(TypeError, "String value expected", normalize_string, 100)
self.assertRaisesRegex(EncodingError, "Encoding base32 not supported", pubkeyhash_to_addr, '123',
encoding='base32')
addr = 'qc1qy8qmc6262m68ny0ftlexs4h9paud8sgce3sf84'
self.assertRaisesRegexp(EncodingError, "Invalid bech32 address. Prefix 'qc', prefix expected is 'bc'",
self.assertRaisesRegex(EncodingError, "Invalid bech32 address. Prefix 'qc', prefix expected is 'bc'",
addr_bech32_to_pubkeyhash, addr, prefix='bc')


Expand Down Expand Up @@ -169,7 +169,7 @@ def test_address_base58_zero_prefixes(self):
self.assertEqual(change_base('0000003acd8f60b766e48e9db32093b419c21de7e9b35f7e0d', 16, 58), '111GxfgFVyDW3zcFpUF1upSZoL7GCRiLk')
self.assertEqual(change_base('1111GxfgFVyDW3zcFpUF1upSZoL7GCRiLk', 58, 256).hex(),
'000000003acd8f60b766e48e9db32093b419c21de7e9b35f7e0d')
self.assertRaisesRegexp(EncodingError, "Invalid address hash160 length, should be 25 characters not",
self.assertRaisesRegex(EncodingError, "Invalid address hash160 length, should be 25 characters not",
addr_base58_to_pubkeyhash, '1111GxfgFVyDW3zcFpUF1upSZoL7GCRiLk')


Expand Down

0 comments on commit 4cd0b08

Please sign in to comment.