diff options
| author | Guido van Rossum <guido@dropbox.com> | 2015-11-19 05:13:42 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@dropbox.com> | 2015-11-19 05:13:42 (GMT) |
| commit | 5497ac475857b913cdddef72d87ec171abd6a42a (patch) | |
| tree | 7717f83b8f63f4aa9cdf8a0f0dd391dcd7520cc7 /Lib/typing.py | |
| parent | 255230595f397df042c03f30674f663a9e8e2702 (diff) | |
| parent | bb7c57c6cdc9e36a9b5875f5bcfd52a8df10b7ba (diff) | |
| download | cpython-5497ac475857b913cdddef72d87ec171abd6a42a.zip cpython-5497ac475857b913cdddef72d87ec171abd6a42a.tar.gz cpython-5497ac475857b913cdddef72d87ec171abd6a42a.tar.bz2 | |
Issue #25472: In B[<type>], insert B in front of __bases__, to make the __dict__ descriptor work. (Merge 3.5->3.6)
Diffstat (limited to 'Lib/typing.py')
| -rw-r--r-- | Lib/typing.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/typing.py b/Lib/typing.py index d900036..49c4a06 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -981,7 +981,7 @@ class GenericMeta(TypingMeta, abc.ABCMeta): "Cannot substitute %s for %s in %s" % (_type_repr(new), _type_repr(old), self)) - return self.__class__(self.__name__, self.__bases__, + return self.__class__(self.__name__, (self,) + self.__bases__, dict(self.__dict__), parameters=params, origin=self, |