From 0630c4b1fd7f089d7eaadf9d49633eb492da0f91 Mon Sep 17 00:00:00 2001 From: Shantanu Date: Wed, 13 May 2020 23:57:50 -0700 Subject: [PATCH] unittest.mock: fix MRO of Mock (#3990) * unittest.mock: fix MRO of Mock * Make consistent Co-authored-by: hauntsaninja <> --- 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 9df57a9ec..0d2cd387b 100644 --- a/stdlib/3/unittest/mock.pyi +++ b/stdlib/3/unittest/mock.pyi @@ -123,7 +123,7 @@ class CallableMixin(Base): def __init__(self, spec: Optional[Any] = ..., side_effect: Optional[Any] = ..., return_value: Any = ..., wraps: Optional[Any] = ..., name: Optional[Any] = ..., spec_set: Optional[Any] = ..., parent: Optional[Any] = ..., _spec_state: Optional[Any] = ..., _new_name: Any = ..., _new_parent: Optional[Any] = ..., **kwargs: Any) -> None: ... def __call__(_mock_self, *args: Any, **kwargs: Any) -> Any: ... -class Mock(NonCallableMock, CallableMixin): ... +class Mock(CallableMixin, NonCallableMock): ... class _patch: attribute_name: Any diff --git a/third_party/2and3/mock.pyi b/third_party/2and3/mock.pyi index 9df57a9ec..0d2cd387b 100644 --- a/third_party/2and3/mock.pyi +++ b/third_party/2and3/mock.pyi @@ -123,7 +123,7 @@ class CallableMixin(Base): def __init__(self, spec: Optional[Any] = ..., side_effect: Optional[Any] = ..., return_value: Any = ..., wraps: Optional[Any] = ..., name: Optional[Any] = ..., spec_set: Optional[Any] = ..., parent: Optional[Any] = ..., _spec_state: Optional[Any] = ..., _new_name: Any = ..., _new_parent: Optional[Any] = ..., **kwargs: Any) -> None: ... def __call__(_mock_self, *args: Any, **kwargs: Any) -> Any: ... -class Mock(NonCallableMock, CallableMixin): ... +class Mock(CallableMixin, NonCallableMock): ... class _patch: attribute_name: Any