Pr review updates

Author: njgheorghita

web3/providers/ipc.py

@@ -1,3 +1,6 @@
+from json import (
+    JSONDecodeError,
+)
 import logging
 import os
 from pathlib import (
@@ -6,6 +9,9 @@
 import socket
 import sys
 import threading
+from types import (
+    TracebackType,
+)
 from typing import (
     Any,
     Type,
@@ -23,13 +29,6 @@
     JSONBaseProvider,
 )
 
-try:
-    from json import JSONDecodeError
-except ImportError:
-    # type ignored b/c mypy unhappy w/ conflicting exception types
-    # difficult to cast / resolve w/ conditional import
-    JSONDecodeError = ValueError  # type: ignore
-
 
 def get_ipc_socket(ipc_path: str, timeout: float=0.1) -> socket.socket:
     if sys.platform == 'win32':
@@ -58,7 +57,9 @@ def __enter__(self) -> socket.socket:
             self.sock = self._open()
         return self.sock
 
-    def __exit__(self, exc_type: Type[BaseException], exc_value: Any, traceback: Any) -> None:
+    def __exit__(
+        self, exc_type: Type[BaseException], exc_value: BaseException, traceback: TracebackType
+    ) -> None:
         # only close the socket if there was an error
         if exc_value is not None:
             try:

web3/providers/rpc.py

@@ -61,7 +61,7 @@ def __str__(self) -> str:
         return "RPC connection {0}".format(self.endpoint_uri)
 
     @to_dict
-    def get_request_kwargs(self) -> Iterable[Tuple[Any, Any]]:
+    def get_request_kwargs(self) -> Iterable[Tuple[str, Any]]:
         if 'headers' not in self._request_kwargs:
             yield 'headers', self.get_request_headers()
         for key, value in self._request_kwargs.items():

web3/providers/websocket.py

@@ -5,6 +5,9 @@
 from threading import (
     Thread,
 )
+from types import (
+    TracebackType,
+)
 from typing import (
     Any,
     Type,
@@ -64,7 +67,9 @@ async def __aenter__(self) -> websockets.WebSocketClientProtocol:
             )
         return self.ws
 
-    async def __aexit__(self, exc_type: Type[BaseException], exc_val: Any, exc_tb: Any) -> None:
+    async def __aexit__(
+        self, exc_type: Type[BaseException], exc_val: BaseException, exc_tb: TracebackType
+    ) -> None:
         if exc_val is not None:
             try:
                 await self.ws.close()