From 42185a3f183fbe7265f3e449822b5eade08b29a0 Mon Sep 17 00:00:00 2001 From: Jaromir Latal Date: Thu, 30 Jul 2020 11:18:57 +0100 Subject: [PATCH 1/3] [stdlib][unittest] Fix mock.call(...) types --- stdlib/3/unittest/mock.pyi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stdlib/3/unittest/mock.pyi b/stdlib/3/unittest/mock.pyi index e58f1bc6a002..d19f271f6020 100644 --- a/stdlib/3/unittest/mock.pyi +++ b/stdlib/3/unittest/mock.pyi @@ -51,13 +51,13 @@ class _Call(Tuple[Any, ...]): ) -> None: ... def __eq__(self, other: Any) -> bool: ... __ne__: Any - def __call__(self, *args: Any, **kwargs: Any) -> Any: ... + def __call__(self, *args: Any, **kwargs: Any) -> "_Call": ... def __getattr__(self, attr: Any) -> Any: ... def count(self, *args: Any, **kwargs: Any) -> Any: ... def index(self, *args: Any, **kwargs: Any) -> Any: ... def call_list(self) -> Any: ... -call: Any +call: _Call class _CallList(List[_Call]): def __contains__(self, value: Any) -> bool: ... From beea69ee69d793e9515a957f9e6ca4a7f990c547 Mon Sep 17 00:00:00 2001 From: Jaromir Latal Date: Thu, 30 Jul 2020 11:28:03 +0100 Subject: [PATCH 2/3] make tp/2and3 mock consistent --- third_party/2and3/mock.pyi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/third_party/2and3/mock.pyi b/third_party/2and3/mock.pyi index e58f1bc6a002..d19f271f6020 100644 --- a/third_party/2and3/mock.pyi +++ b/third_party/2and3/mock.pyi @@ -51,13 +51,13 @@ class _Call(Tuple[Any, ...]): ) -> None: ... def __eq__(self, other: Any) -> bool: ... __ne__: Any - def __call__(self, *args: Any, **kwargs: Any) -> Any: ... + def __call__(self, *args: Any, **kwargs: Any) -> "_Call": ... def __getattr__(self, attr: Any) -> Any: ... def count(self, *args: Any, **kwargs: Any) -> Any: ... def index(self, *args: Any, **kwargs: Any) -> Any: ... def call_list(self) -> Any: ... -call: Any +call: _Call class _CallList(List[_Call]): def __contains__(self, value: Any) -> bool: ... From c0ec50eab522b6fc75ab9cf57963abaf11faccc8 Mon Sep 17 00:00:00 2001 From: Jaromir Latal Date: Thu, 30 Jul 2020 19:36:56 +0100 Subject: [PATCH 3/3] remove quotes from forward ref --- stdlib/3/unittest/mock.pyi | 2 +- third_party/2and3/mock.pyi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stdlib/3/unittest/mock.pyi b/stdlib/3/unittest/mock.pyi index d19f271f6020..1de1d07a90e4 100644 --- a/stdlib/3/unittest/mock.pyi +++ b/stdlib/3/unittest/mock.pyi @@ -51,7 +51,7 @@ class _Call(Tuple[Any, ...]): ) -> None: ... def __eq__(self, other: Any) -> bool: ... __ne__: Any - def __call__(self, *args: Any, **kwargs: Any) -> "_Call": ... + def __call__(self, *args: Any, **kwargs: Any) -> _Call: ... def __getattr__(self, attr: Any) -> Any: ... def count(self, *args: Any, **kwargs: Any) -> Any: ... def index(self, *args: Any, **kwargs: Any) -> Any: ... diff --git a/third_party/2and3/mock.pyi b/third_party/2and3/mock.pyi index d19f271f6020..1de1d07a90e4 100644 --- a/third_party/2and3/mock.pyi +++ b/third_party/2and3/mock.pyi @@ -51,7 +51,7 @@ class _Call(Tuple[Any, ...]): ) -> None: ... def __eq__(self, other: Any) -> bool: ... __ne__: Any - def __call__(self, *args: Any, **kwargs: Any) -> "_Call": ... + def __call__(self, *args: Any, **kwargs: Any) -> _Call: ... def __getattr__(self, attr: Any) -> Any: ... def count(self, *args: Any, **kwargs: Any) -> Any: ... def index(self, *args: Any, **kwargs: Any) -> Any: ...