Remove unnecessary changes

Author: kclowes

ens/async_ens.py

@@ -72,7 +72,9 @@
         AsyncContract,
         AsyncContractFunction,
     )
-    from web3.main import AsyncWeb3  # noqa: F401
+    from web3.main import (  # noqa: F401
+        AsyncWeb3,
+    )
     from web3.middleware.base import (  # noqa: F401
         Middleware,
     )
@@ -100,8 +102,8 @@ class AsyncENS(BaseENS):
 
     def __init__(
         self,
-        provider: "AsyncBaseProvider" = None,
-        addr: ChecksumAddress = None,
+        provider: Optional["AsyncBaseProvider"] = None,
+        addr: Optional[ChecksumAddress] = None,
         middleware: Optional[Sequence[Tuple["Middleware", str]]] = None,
     ) -> None:
         """

web3/_utils/abi.py

@@ -101,7 +101,9 @@
 )
 
 if TYPE_CHECKING:
-    from web3.main import AsyncWeb3  # noqa: F401
+    from web3 import (  # noqa: F401
+        AsyncWeb3,
+    )
 
 
 def fallback_func_abi_exists(contract_abi: ABI) -> Sequence[ABIFallback]:

web3/_utils/batching.py

@@ -167,9 +167,9 @@ def __exit__(
     async def async_execute(self) -> List["RPCResponse"]:
         self._validate_is_batching()
         if self._provider.has_persistent_connection:
-            responses = await cast(
-                "AsyncWeb3[Any]", self.web3
-            ).manager._async_make_socket_batch_request(self._async_requests_info)
+            responses = await self.web3.manager._async_make_socket_batch_request(
+                self._async_requests_info
+            )
         else:
             responses = await self.web3.manager._async_make_batch_request(
                 self._async_requests_info

web3/_utils/module_testing/web3_module.py

@@ -717,9 +717,7 @@ async def test_batch_requests_clear(self, async_w3: AsyncWeb3[Any]) -> None:
         assert cast(BlockData, r3)["number"] == 6
 
     @pytest.mark.asyncio
-    async def test_batch_requests_cancel(
-        self, async_w3: AsyncWeb3[Any]
-    ) -> None:  # noqa: E501
+    async def test_batch_requests_cancel(self, async_w3: AsyncWeb3[Any]) -> None:
         # as context manager
         async with async_w3.batch_requests() as batch:
             batch.add(async_w3.eth.get_block(1))
@@ -759,10 +757,10 @@ async def test_batch_requests_cancel(
         assert isinstance(block_num, int)
 
     @pytest.mark.asyncio
-    async def test_batch_requests_raises_for_common_unsupported_methods(  # noqa: E501
+    async def test_batch_requests_raises_for_common_unsupported_methods(
         self,
         async_w3: AsyncWeb3[Any],
-        async_math_contract: "AsyncContract",  # noqa: E501
+        async_math_contract: "AsyncContract",
     ) -> None:
         async with async_w3.batch_requests() as batch:
             with pytest.raises(MethodNotSupported, match="eth_sendTransaction"):
@@ -785,7 +783,7 @@ async def test_batch_requests_raises_for_common_unsupported_methods(  # noqa: E5
                 await batch.async_execute()
 
     @pytest.mark.asyncio
-    async def test_batch_requests_concurrently_with_regular_requests(  # noqa: E501
+    async def test_batch_requests_concurrently_with_regular_requests(
         self, async_w3: AsyncWeb3[Any]
     ) -> None:
         responses = []

web3/providers/base.py

@@ -192,9 +192,9 @@ def batch_request_func(
                 # type ignore bc in order to wrap the method, we have to call
                 # `wrap_make_batch_request` with the accumulator_fn as the argument
                 # which breaks the type hinting for this particular case.
-                accumulator_fn = initialized.wrap_make_batch_request(
+                accumulator_fn = initialized.wrap_make_batch_request(  # type: ignore
                     accumulator_fn
-                )  # type: ignore
+                )
             self._batch_request_func_cache = (middleware, accumulator_fn)
 
         return self._batch_request_func_cache[-1]