Skip to content

Improve annotations for json.load() and loads() #2382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JelleZijlstra merged 1 commit into from
Aug 14, 2018
Merged

Improve annotations for json.load() and loads() #2382

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions stdlib/3/json/__init__.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import sys
from typing import Any, IO, Optional, Tuple, Callable, Dict, List, Union
from typing import Any, IO, Optional, Tuple, Callable, Dict, List, Union, Protocol

from .decoder import JSONDecoder as JSONDecoder
from .encoder import JSONEncoder as JSONEncoder
Expand Down Expand Up @@ -31,7 +31,11 @@ def dump(obj: Any,
sort_keys: bool = ...,
**kwds: Any) -> None: ...

def loads(s: Union[str, bytes, bytearray],
if sys.version_info >= (3, 6):
_LoadsString = Union[str, bytes, bytearray]
else:
_LoadsString = str
def loads(s: _LoadsString,
encoding: Any = ..., # ignored and deprecated
cls: Any = ...,
object_hook: Optional[Callable[[Dict], Any]] = ...,
Expand All @@ -41,11 +45,10 @@ def loads(s: Union[str, bytes, bytearray],
object_pairs_hook: Optional[Callable[[List[Tuple[Any, Any]]], Any]] = ...,
**kwds: Any) -> Any: ...

if sys.version_info >= (3, 6):
_LoadIO = IO[Any]
else:
_LoadIO = IO[str]
def load(fp: _LoadIO,
class _Reader(Protocol):
def read(self) -> _LoadsString: ...

def load(fp: _Reader,
cls: Any = ...,
object_hook: Optional[Callable[[Dict], Any]] = ...,
parse_float: Optional[Callable[[str], Any]] = ...,
Expand Down