apply black and isort (#4287)

* apply black and isort

* move some type ignores

stdlib/3/json/__init__.pyi

@@ -1,58 +1,65 @@
 import sys
-from typing import Any, IO, Optional, Tuple, Callable, Dict, List, Union, Type
+from typing import IO, Any, Callable, Dict, List, Optional, Tuple, Type, Union
+
 from _typeshed import SupportsRead
 
-from .decoder import JSONDecoder as JSONDecoder
+from .decoder import JSONDecodeError as JSONDecodeError, JSONDecoder as JSONDecoder
 from .encoder import JSONEncoder as JSONEncoder
-from .decoder import JSONDecodeError as JSONDecodeError
 
-def dumps(obj: Any,
-          *,
-          skipkeys: bool = ...,
-          ensure_ascii: bool = ...,
-          check_circular: bool = ...,
-          allow_nan: bool = ...,
-          cls: Optional[Type[JSONEncoder]] = ...,
-          indent: Union[None, int, str] = ...,
-          separators: Optional[Tuple[str, str]] = ...,
-          default: Optional[Callable[[Any], Any]] = ...,
-          sort_keys: bool = ...,
-          **kwds: Any) -> str: ...
-
-def dump(obj: Any,
-         fp: IO[str],
-         *,
-         skipkeys: bool = ...,
-         ensure_ascii: bool = ...,
-         check_circular: bool = ...,
-         allow_nan: bool = ...,
-         cls: Optional[Type[JSONEncoder]] = ...,
-         indent: Union[None, int, str] = ...,
-         separators: Optional[Tuple[str, str]] = ...,
-         default: Optional[Callable[[Any], Any]] = ...,
-         sort_keys: bool = ...,
-         **kwds: Any) -> None: ...
+def dumps(
+    obj: Any,
+    *,
+    skipkeys: bool = ...,
+    ensure_ascii: bool = ...,
+    check_circular: bool = ...,
+    allow_nan: bool = ...,
+    cls: Optional[Type[JSONEncoder]] = ...,
+    indent: Union[None, int, str] = ...,
+    separators: Optional[Tuple[str, str]] = ...,
+    default: Optional[Callable[[Any], Any]] = ...,
+    sort_keys: bool = ...,
+    **kwds: Any,
+) -> str: ...
+def dump(
+    obj: Any,
+    fp: IO[str],
+    *,
+    skipkeys: bool = ...,
+    ensure_ascii: bool = ...,
+    check_circular: bool = ...,
+    allow_nan: bool = ...,
+    cls: Optional[Type[JSONEncoder]] = ...,
+    indent: Union[None, int, str] = ...,
+    separators: Optional[Tuple[str, str]] = ...,
+    default: Optional[Callable[[Any], Any]] = ...,
+    sort_keys: bool = ...,
+    **kwds: Any,
+) -> None: ...
 
 if sys.version_info >= (3, 6):
     _LoadsString = Union[str, bytes]
 else:
     _LoadsString = str
-def loads(s: _LoadsString,
-          *,
-          cls: Optional[Type[JSONDecoder]] = ...,
-          object_hook: Optional[Callable[[Dict[Any, Any]], Any]] = ...,
-          parse_float: Optional[Callable[[str], Any]] = ...,
-          parse_int: Optional[Callable[[str], Any]] = ...,
-          parse_constant: Optional[Callable[[str], Any]] = ...,
-          object_pairs_hook: Optional[Callable[[List[Tuple[Any, Any]]], Any]] = ...,
-          **kwds: Any) -> Any: ...
 
-def load(fp: SupportsRead[_LoadsString],
-         *,
-         cls: Optional[Type[JSONDecoder]] = ...,
-         object_hook: Optional[Callable[[Dict[Any, Any]], Any]] = ...,
-         parse_float: Optional[Callable[[str], Any]] = ...,
-         parse_int: Optional[Callable[[str], Any]] = ...,
-         parse_constant: Optional[Callable[[str], Any]] = ...,
-         object_pairs_hook: Optional[Callable[[List[Tuple[Any, Any]]], Any]] = ...,
-         **kwds: Any) -> Any: ...
+def loads(
+    s: _LoadsString,
+    *,
+    cls: Optional[Type[JSONDecoder]] = ...,
+    object_hook: Optional[Callable[[Dict[Any, Any]], Any]] = ...,
+    parse_float: Optional[Callable[[str], Any]] = ...,
+    parse_int: Optional[Callable[[str], Any]] = ...,
+    parse_constant: Optional[Callable[[str], Any]] = ...,
+    object_pairs_hook: Optional[Callable[[List[Tuple[Any, Any]]], Any]] = ...,
+    **kwds: Any,
+) -> Any: ...
+def load(
+    fp: SupportsRead[_LoadsString],
+    *,
+    cls: Optional[Type[JSONDecoder]] = ...,
+    object_hook: Optional[Callable[[Dict[Any, Any]], Any]] = ...,
+    parse_float: Optional[Callable[[str], Any]] = ...,
+    parse_int: Optional[Callable[[str], Any]] = ...,
+    parse_constant: Optional[Callable[[str], Any]] = ...,
+    object_pairs_hook: Optional[Callable[[List[Tuple[Any, Any]]], Any]] = ...,
+    **kwds: Any,
+) -> Any: ...

stdlib/3/json/decoder.pyi

@@ -26,7 +26,7 @@ class JSONDecoder:
             parse_int: Optional[Callable[[str], Any]] = ...,
             parse_constant: Optional[Callable[[str], Any]] = ...,
             strict: bool = ...,
-            object_pairs_hook: Optional[Callable[[List[Tuple[str, Any]]], Any]] = ...
+            object_pairs_hook: Optional[Callable[[List[Tuple[str, Any]]], Any]] = ...,
         ) -> None: ...
     else:
         def __init__(

stdlib/3/json/encoder.pyi

@@ -23,7 +23,7 @@ class JSONEncoder:
             sort_keys: bool = ...,
             indent: Optional[int] = ...,
             separators: Optional[Tuple[str, str]] = ...,
-            default: Optional[Callable[..., Any]] = ...
+            default: Optional[Callable[..., Any]] = ...,
         ) -> None: ...
     else:
         def __init__(