From 734ad44a113ade0030610f333783f73b39697582 Mon Sep 17 00:00:00 2001 From: Jukka Lehtosalo Date: Tue, 17 Jan 2017 13:55:31 +0000 Subject: [PATCH] Make MRO of UserDict.DictMixin consistent with Mapping (#837) This fixes MRO conflicts produced by mypy when using multiple inheritance. --- stdlib/2/UserDict.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdlib/2/UserDict.pyi b/stdlib/2/UserDict.pyi index a30c2e9b0..2d2b8c6c4 100644 --- a/stdlib/2/UserDict.pyi +++ b/stdlib/2/UserDict.pyi @@ -14,7 +14,7 @@ class UserDict(Dict[_KT, _VT], Generic[_KT, _VT]): class IterableUserDict(UserDict[_KT, _VT], Generic[_KT, _VT]): ... -class DictMixin(Sized, Iterable[_KT], Container[_KT], Generic[_KT, _VT]): +class DictMixin(Iterable[_KT], Container[_KT], Sized, Generic[_KT, _VT]): def has_key(self, key: _KT) -> bool: ... # From typing.Mapping[_KT, _VT]