wip

Author: jpic

docs/v6_migration.rst

@@ -12,5 +12,21 @@ Here are the most common required updates:
 Web3.py does not raise ValueError nor AttributeError instances anymore
 ----------------------------------------------------------------------
 
-In v5, some Web3.py exceptions inherited from ValueError or AttributeError.
+In v5, some Web3.py exceptions inherited from AttributeError, namely:
+
+- NoABIFunctionsFound
+- NoABIFound
+- NoABIEventsFound
+
+Others inherited from ValueError, namely:
+
+- InvalidAddress
+- NameNotFound
+- LogTopicError
+- InvalidEventABI
+
 Now Web3.py exceptions now inherit from the same base Web3Exception.
+
+As such, any code that was expecting a ValueError or an AttributeError from
+Web3py must update to expecting one of the exception listed above, or
+Web3Exception.

tests/core/contracts/test_contract_call_interface.py

@@ -27,6 +27,7 @@
     BlockNumberOutofRange,
     InvalidAddress,
     MismatchedABI,
+    NameNotFound,
     NoABIFound,
     NoABIFunctionsFound,
     ValidationError,
@@ -468,7 +469,7 @@ def test_call_address_reflector_name_array(address_reflector_contract, call):
 
 def test_call_reject_invalid_ens_name(address_reflector_contract, call):
     with contract_ens_addresses(address_reflector_contract, []):
-        with pytest.raises(ValueError):
+        with pytest.raises(NameNotFound):
             call(contract=address_reflector_contract,
                  contract_function='reflect',
                  func_args=['type0.eth'])

tests/core/eth-module/test_eth_contract.py

@@ -8,7 +8,7 @@
 )
 
 from web3.exceptions import (
-    NameNotFound,
+    InvalidAddress,
 )
 
 ABI = [{}]
@@ -23,11 +23,11 @@
     (
         ((ADDRESS,), {}, None),
         ((BYTES_ADDRESS,), {}, None),
-        ((INVALID_CHECKSUM_ADDRESS,), {}, NameNotFound),
-        ((NON_CHECKSUM_ADDRESS,), {}, NameNotFound),
+        ((INVALID_CHECKSUM_ADDRESS,), {}, InvalidAddress),
+        ((NON_CHECKSUM_ADDRESS,), {}, InvalidAddress),
         ((), {'address': ADDRESS}, None),
-        ((), {'address': INVALID_CHECKSUM_ADDRESS}, NameNotFound),
-        ((), {'address': NON_CHECKSUM_ADDRESS}, NameNotFound),
+        ((), {'address': INVALID_CHECKSUM_ADDRESS}, InvalidAddress),
+        ((), {'address': NON_CHECKSUM_ADDRESS}, InvalidAddress),
     )
 )
 def test_contract_address_validation(web3, args, kwargs, expected):

web3/exceptions.py

@@ -138,7 +138,7 @@ class PMError(Web3Exception):
     pass
 
 
-class ManifestValidationError(Web3Exception):
+class ManifestValidationError(PMError):
     """
     Raised when a provided manifest cannot be published, since it's invalid.
     """