Move from 3.8 -> 3.9

Author: kclowes

ens/_normalization.py

@@ -6,8 +6,6 @@
 from typing import (
     Any,
     Literal,
-    Optional,
-    Union,
 )
 
 from pyunormalize import (
@@ -64,7 +62,7 @@ class Token:
     type: Literal[TokenType.TEXT, TokenType.EMOJI]
     _original_text: str
     _original_codepoints: list[int]
-    _normalized_codepoints: Optional[list[int]] = None
+    _normalized_codepoints: list[int] | None = None
 
     restricted: bool = False
 
@@ -205,7 +203,7 @@ def _is_fenced(cp: int) -> bool:
     return cp in [fenced[0] for fenced in NORMALIZATION_SPEC["fenced"]]
 
 
-def _codepoints_to_text(cps: Union[list[list[int]], list[int]]) -> str:
+def _codepoints_to_text(cps: list[list[int]] | list[int]) -> str:
     return "".join(
         chr(cp) if isinstance(cp, int) else _codepoints_to_text(cp) for cp in cps
     )
@@ -400,7 +398,7 @@ def _build_and_validate_label_from_tokens(tokens: list[Token]) -> Label:
     return label
 
 
-def _buffer_codepoints_to_chars(buffer: Union[list[int], list[list[int]]]) -> str:
+def _buffer_codepoints_to_chars(buffer: list[int] | list[list[int]]) -> str:
     return "".join(
         "".join(chr(c) for c in char) if isinstance(char, list) else chr(char)
         for char in buffer

ens/async_ens.py

@@ -9,7 +9,6 @@
     TYPE_CHECKING,
     Any,
     Optional,
-    Union,
     cast,
 )
 
@@ -103,9 +102,9 @@ class AsyncENS(BaseENS):
 
     def __init__(
         self,
-        provider: Optional["AsyncBaseProvider"] = None,
-        addr: Optional[ChecksumAddress] = None,
-        middleware: Optional[Sequence[tuple["Middleware", str]]] = None,
+        provider: "AsyncBaseProvider" | None = None,
+        addr: ChecksumAddress | None = None,
+        middleware: Sequence[tuple["Middleware", str]] | None = None,
     ) -> None:
         """
         :param provider: a single provider used to connect to Ethereum
@@ -138,7 +137,11 @@ def from_web3(
         """
         provider = w3.manager.provider
         middleware = w3.middleware_onion.middleware
-        ns = cls(cast("AsyncBaseProvider", provider), addr=addr, middleware=middleware)
+        ns = cls(
+            cast("AsyncBaseProvider", provider),
+            addr=addr,
+            middleware=middleware,
+        )
 
         # inherit strict bytes checking from w3 instance
         ns.strict_bytes_type_checking = w3.strict_bytes_type_checking
@@ -148,8 +151,8 @@ def from_web3(
     async def address(
         self,
         name: str,
-        coin_type: Optional[int] = None,
-    ) -> Optional[ChecksumAddress]:
+        coin_type: int | None = None,
+    ) -> ChecksumAddress | None:
         """
         Look up the Ethereum address that `name` currently points to.
 
@@ -164,7 +167,10 @@ async def address(
         else:
             r = await self.resolver(name)
             await _async_validate_resolver_and_interface_id(
-                name, r, ENS_MULTICHAIN_ADDRESS_INTERFACE_ID, "addr(bytes32,uint256)"
+                name,
+                r,
+                ENS_MULTICHAIN_ADDRESS_INTERFACE_ID,
+                "addr(bytes32,uint256)",
             )
             node = raw_name_to_hash(name)
             address_as_bytes = await r.caller.addr(node, coin_type)
@@ -175,12 +181,12 @@ async def address(
     async def setup_address(
         self,
         name: str,
-        address: Union[Address, ChecksumAddress, HexAddress] = cast(  # noqa: B008
-            ChecksumAddress, default
-        ),
-        coin_type: Optional[int] = None,
+        address: Address
+        | ChecksumAddress
+        | HexAddress = cast(ChecksumAddress, default),  # noqa: B008
+        coin_type: int | None = None,
         transact: Optional["TxParams"] = None,
-    ) -> Optional[HexBytes]:
+    ) -> HexBytes | None:
         """
         Set up the name to point to the supplied address.
         The sender of the transaction must own the name, or
@@ -229,7 +235,7 @@ async def setup_address(
                 transact
             )
 
-    async def name(self, address: ChecksumAddress) -> Optional[str]:
+    async def name(self, address: ChecksumAddress) -> str | None:
         """
         Look up the name that the address points to, using a
         reverse lookup. Reverse lookup is opt-in for name owners.
@@ -249,7 +255,7 @@ async def name(self, address: ChecksumAddress) -> Optional[str]:
     async def setup_name(
         self,
         name: str,
-        address: Optional[ChecksumAddress] = None,
+        address: ChecksumAddress | None = None,
         transact: Optional["TxParams"] = None,
     ) -> HexBytes:
         """
@@ -315,7 +321,7 @@ async def setup_owner(
         name: str,
         new_owner: ChecksumAddress = None,
         transact: Optional["TxParams"] = None,
-    ) -> Optional[ChecksumAddress]:
+    ) -> ChecksumAddress | None:
         """
         Set the owner of the supplied name to `new_owner`.
 
@@ -455,7 +461,8 @@ async def _get_resolver(
             if not is_none_or_zero_address(resolver_addr):
                 # if resolver found, return it
                 resolver = cast(
-                    "AsyncContract", self._type_aware_resolver(resolver_addr, fn_name)
+                    "AsyncContract",
+                    self._type_aware_resolver(resolver_addr, fn_name),
                 )
                 return resolver, current_name
 
@@ -465,7 +472,7 @@ async def _get_resolver(
     async def _set_resolver(
         self,
         name: str,
-        resolver_addr: Optional[ChecksumAddress] = None,
+        resolver_addr: ChecksumAddress | None = None,
         transact: Optional["TxParams"] = None,
     ) -> "AsyncContract":
         if not transact:
@@ -488,7 +495,7 @@ async def _resolve(
         self,
         name: str,
         fn_name: str = "addr",
-    ) -> Optional[Union[ChecksumAddress, str]]:
+    ) -> ChecksumAddress | str | None:
         normal_name = normalize_name(name)
 
         resolver, current_name = await self._get_resolver(normal_name, fn_name)
@@ -524,7 +531,7 @@ async def _assert_control(
         self,
         account: ChecksumAddress,
         name: str,
-        parent_owned: Optional[str] = None,
+        parent_owned: str | None = None,
     ) -> None:
         if not address_in(account, await self.w3.eth.accounts):
             raise UnauthorizedError(
@@ -534,7 +541,7 @@ async def _assert_control(
 
     async def _first_owner(
         self, name: str
-    ) -> tuple[Optional[ChecksumAddress], Sequence[str], str]:
+    ) -> tuple[ChecksumAddress | None, Sequence[str], str]:
         """
         Takes a name, and returns the owner of the deepest subdomain that has an owner
 
@@ -555,7 +562,7 @@ async def _claim_ownership(
         owner: ChecksumAddress,
         unowned: Sequence[str],
         owned: str,
-        old_owner: Optional[ChecksumAddress] = None,
+        old_owner: ChecksumAddress | None = None,
         transact: Optional["TxParams"] = None,
     ) -> None:
         if not transact:
@@ -576,7 +583,7 @@ async def _claim_ownership(
 
     async def _setup_reverse(
         self,
-        name: Optional[str],
+        name: str | None,
         address: ChecksumAddress,
         transact: Optional["TxParams"] = None,
     ) -> HexBytes:

ens/base_ens.py

@@ -39,8 +39,8 @@
 class BaseENS:
     w3: Union["AsyncWeb3[Any]", "Web3"] = None
     ens: Union["Contract", "AsyncContract"] = None
-    _resolver_contract: Union[type["Contract"], type["AsyncContract"]] = None
-    _reverse_resolver_contract: Union[type["Contract"], type["AsyncContract"]] = None
+    _resolver_contract: type["Contract"] | type["AsyncContract"] = None
+    _reverse_resolver_contract: type["Contract"] | type["AsyncContract"] = None
 
     @property
     def strict_bytes_type_checking(self) -> bool:

ens/ens.py

@@ -8,7 +8,6 @@
     TYPE_CHECKING,
     Any,
     Optional,
-    Union,
     cast,
 )
 
@@ -101,7 +100,7 @@ def __init__(
         self,
         provider: "BaseProvider" = None,
         addr: ChecksumAddress = None,
-        middleware: Optional[Sequence[tuple["Middleware", str]]] = None,
+        middleware: Sequence[tuple["Middleware", str]] | None = None,
     ) -> None:
         """
         :param provider: a single provider used to connect to Ethereum
@@ -143,8 +142,8 @@ def from_web3(cls, w3: "Web3", addr: ChecksumAddress = None) -> "ENS":
     def address(
         self,
         name: str,
-        coin_type: Optional[int] = None,
-    ) -> Optional[ChecksumAddress]:
+        coin_type: int | None = None,
+    ) -> ChecksumAddress | None:
         """
         Look up the Ethereum address that `name` currently points to.
 
@@ -173,12 +172,12 @@ def address(
     def setup_address(
         self,
         name: str,
-        address: Union[Address, ChecksumAddress, HexAddress] = cast(  # noqa: B008
-            ChecksumAddress, default
-        ),
-        coin_type: Optional[int] = None,
+        address: Address
+        | ChecksumAddress
+        | HexAddress = cast(ChecksumAddress, default),  # noqa: B008
+        coin_type: int | None = None,
         transact: Optional["TxParams"] = None,
-    ) -> Optional[HexBytes]:
+    ) -> HexBytes | None:
         """
         Set up the name to point to the supplied address.
         The sender of the transaction must own the name, or
@@ -228,7 +227,7 @@ def setup_address(
                 transact
             )
 
-    def name(self, address: ChecksumAddress) -> Optional[str]:
+    def name(self, address: ChecksumAddress) -> str | None:
         """
         Look up the name that the address points to, using a
         reverse lookup. Reverse lookup is opt-in for name owners.
@@ -246,7 +245,7 @@ def name(self, address: ChecksumAddress) -> Optional[str]:
     def setup_name(
         self,
         name: str,
-        address: Optional[ChecksumAddress] = None,
+        address: ChecksumAddress | None = None,
         transact: Optional["TxParams"] = None,
     ) -> HexBytes:
         """
@@ -312,7 +311,7 @@ def setup_owner(
         name: str,
         new_owner: ChecksumAddress = None,
         transact: Optional["TxParams"] = None,
-    ) -> Optional[ChecksumAddress]:
+    ) -> ChecksumAddress | None:
         """
         Set the owner of the supplied name to `new_owner`.
 
@@ -454,7 +453,7 @@ def _get_resolver(
     def _set_resolver(
         self,
         name: str,
-        resolver_addr: Optional[ChecksumAddress] = None,
+        resolver_addr: ChecksumAddress | None = None,
         transact: Optional["TxParams"] = None,
     ) -> "Contract":
         if not transact:
@@ -469,7 +468,7 @@ def _set_resolver(
 
     def _resolve(
         self, name: str, fn_name: str = "addr"
-    ) -> Optional[Union[ChecksumAddress, str]]:
+    ) -> ChecksumAddress | str | None:
         normal_name = normalize_name(name)
         resolver, current_name = self._get_resolver(normal_name, fn_name)
         if not resolver:
@@ -502,7 +501,7 @@ def _assert_control(
         self,
         account: ChecksumAddress,
         name: str,
-        parent_owned: Optional[str] = None,
+        parent_owned: str | None = None,
     ) -> None:
         if not address_in(account, self.w3.eth.accounts):
             raise UnauthorizedError(
@@ -512,7 +511,7 @@ def _assert_control(
 
     def _first_owner(
         self, name: str
-    ) -> tuple[Optional[ChecksumAddress], Sequence[str], str]:
+    ) -> tuple[ChecksumAddress | None, Sequence[str], str]:
         """
         Takes a name, and returns the owner of the deepest subdomain that has an owner
 
@@ -533,7 +532,7 @@ def _claim_ownership(
         owner: ChecksumAddress,
         unowned: Sequence[str],
         owned: str,
-        old_owner: Optional[ChecksumAddress] = None,
+        old_owner: ChecksumAddress | None = None,
         transact: Optional["TxParams"] = None,
     ) -> None:
         if not transact:
@@ -550,7 +549,7 @@ def _claim_ownership(
 
     def _setup_reverse(
         self,
-        name: Optional[str],
+        name: str | None,
         address: ChecksumAddress,
         transact: Optional["TxParams"] = None,
     ) -> HexBytes:

ens/utils.py

@@ -9,8 +9,6 @@
 from typing import (
     TYPE_CHECKING,
     Any,
-    Optional,
-    Union,
     cast,
 )
 import warnings
@@ -76,7 +74,7 @@ def Web3() -> type["_Web3"]:
 
 def init_web3(
     provider: "BaseProvider" = None,
-    middleware: Optional[Sequence[tuple["Middleware", str]]] = None,
+    middleware: Sequence[tuple["Middleware", str]] | None = None,
 ) -> "_Web3":
     from web3 import (
         Web3 as Web3Main,
@@ -195,11 +193,11 @@ def is_valid_name(name: str) -> bool:
         return False
 
 
-def to_utc_datetime(timestamp: float) -> Optional[datetime]:
+def to_utc_datetime(timestamp: float) -> datetime | None:
     return datetime.fromtimestamp(timestamp, timezone.utc) if timestamp else None
 
 
-def sha3_text(val: Union[str, bytes]) -> HexBytes:
+def sha3_text(val: str | bytes) -> HexBytes:
     if isinstance(val, str):
         val = val.encode("utf-8")
     return Web3().keccak(val)
@@ -278,7 +276,7 @@ def assert_signer_in_modifier_kwargs(modifier_kwargs: Any) -> ChecksumAddress:
     return modifier_dict["from"]
 
 
-def is_none_or_zero_address(addr: Union[Address, ChecksumAddress, HexAddress]) -> bool:
+def is_none_or_zero_address(addr: Address | ChecksumAddress | HexAddress) -> bool:
     return not addr or addr == EMPTY_ADDR_HEX
 
 
@@ -301,7 +299,7 @@ def is_valid_ens_name(ens_name: str) -> bool:
 
 def init_async_web3(
     provider: "AsyncBaseProvider" = None,
-    middleware: Optional[Sequence[tuple["Middleware", str]]] = (),
+    middleware: Sequence[tuple["Middleware", str]] | None = (),
 ) -> "AsyncWeb3[Any]":
     from web3 import (
         AsyncWeb3 as AsyncWeb3Main,

pyproject.toml

@@ -26,6 +26,7 @@ disallow_untyped_calls = true
 disallow_untyped_decorators = false
 disallow_untyped_defs = true
 ignore_missing_imports = true
+python_version="3.10"
 strict_equality = true
 strict_optional = false
 warn_redundant_casts = true