From 0735ec02512af4ee56d1c7e25e0f550a9cf6f089 Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Sun, 10 Jan 2016 23:30:10 -0800 Subject: [PATCH] Add keyword args to stdlib's json.pyi --- stdlib/2.7/json.pyi | 31 ++++++++++++++++++++++++++++--- stdlib/3/json.pyi | 29 ++++++++++++++++++++++++++--- 2 files changed, 54 insertions(+), 6 deletions(-) diff --git a/stdlib/2.7/json.pyi b/stdlib/2.7/json.pyi index 77720eb54..c5804b4ff 100644 --- a/stdlib/2.7/json.pyi +++ b/stdlib/2.7/json.pyi @@ -1,4 +1,4 @@ -from typing import Any, IO +from typing import Any, IO, Optional, Tuple, Callable class JSONDecodeError(object): def dumps(self, obj: Any) -> str: ... @@ -6,7 +6,32 @@ class JSONDecodeError(object): def loads(self, s: str) -> Any: ... def load(self, fp: IO[str]) -> Any: ... -def dumps(obj: Any, sort_keys: bool = ..., indent: int = ...) -> str: ... -def dump(obj: Any, fp: IO[str], *args: Any, **kwds: Any) -> None: ... +def dumps(obj: Any, + skipkeys: bool = ..., + ensure_ascii: bool = ..., + check_circular: bool = ..., + allow_nan: bool = ..., + cls: Any = ..., + indent: Optional[int] = ..., + separators: Optional[Tuple[str, str]] = ..., + encoding: 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: Any = ..., + indent: Optional[int] = ..., + separators: Optional[Tuple[str, str]] = ..., + encoding: str = ..., + default: Optional[Callable[[Any], Any]] = ..., + sort_keys: bool = ..., + **kwds: Any) -> None: ... + def loads(s: str) -> Any: ... def load(fp: IO[str]) -> Any: ... diff --git a/stdlib/3/json.pyi b/stdlib/3/json.pyi index 348f4af08..f5f1f416b 100644 --- a/stdlib/3/json.pyi +++ b/stdlib/3/json.pyi @@ -1,4 +1,4 @@ -from typing import Any, IO +from typing import Any, IO, Optional, Tuple, Callable class JSONDecodeError(object): def dumps(self, obj: Any) -> str: ... @@ -6,7 +6,30 @@ class JSONDecodeError(object): def loads(self, s: str) -> Any: ... def load(self, fp: IO[str]) -> Any: ... -def dumps(obj: Any) -> str: ... -def dump(obj: Any, fp: IO[str], *args: Any, **kwds: Any) -> None: ... +def dumps(obj: Any, + skipkeys: bool = ..., + ensure_ascii: bool = ..., + check_circular: bool = ..., + allow_nan: bool = ..., + cls: Any = ..., + indent: Optional[int] = ..., + 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: Any = ..., + indent: Optional[int] = ..., + separators: Optional[Tuple[str, str]] = ..., + default: Optional[Callable[[Any], Any]] = ..., + sort_keys: bool = ..., + **kwds: Any) -> None: ... + def loads(s: str) -> Any: ... def load(fp: IO[str]) -> Any: ...