Skip to content

A real fix for issue #250 (failure with mock) #295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 21, 2016
Merged

A real fix for issue #250 (failure with mock) #295

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b07b8ea
A real fix for #250
ilevkivskyi Oct 9, 2016
eb7801b
Use _gorg for the case of multiply parameterized generics
ilevkivskyi Oct 9, 2016
be5d7ed
Formatting
ilevkivskyi Oct 9, 2016
63482fa
Response to comments + some tests
ilevkivskyi Oct 10, 2016
307bf64
Add tests illustrating new dunder attributes; preserve initial class …
ilevkivskyi Oct 16, 2016
f4932bb
Response to comments
ilevkivskyi Oct 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions python2/typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1046,12 +1046,6 @@ class GenericMeta(TypingMeta, abc.ABCMeta):

def __new__(cls, name, bases, namespace,
tvars=None, args=None, origin=None, extra=None):
if extra is None:
extra = namespace.get('__extra__')
if extra is not None and type(extra) is abc.ABCMeta and extra not in bases:
bases = (extra,) + bases
self = super(GenericMeta, cls).__new__(cls, name, bases, namespace)

if tvars is not None:
# Called from __getitem__() below.
assert origin is not None
Expand Down Expand Up @@ -1092,6 +1086,15 @@ def __new__(cls, name, bases, namespace,
", ".join(str(g) for g in gvars)))
tvars = gvars

if extra is None:
extra = namespace.get('__extra__')
if extra is not None and type(extra) is abc.ABCMeta and extra not in bases:
bases = (extra,) + bases
bases = tuple(_gorg(b) if isinstance(b, GenericMeta) else b for b in bases)
if any(isinstance(b, GenericMeta) and b is not Generic for b in bases):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could use a comment explaining what's happening -- it looks like the idea is to remove bare Generic from the bases if there are other generic-derived bases, but to leave generic if if not.

bases = tuple(b for b in bases if b is not Generic)
self = super(GenericMeta, cls).__new__(cls, name, bases, namespace)

self.__parameters__ = tvars
self.__args__ = args
self.__origin__ = origin
Expand Down Expand Up @@ -1180,7 +1183,7 @@ def __getitem__(self, params):
tvars = _type_vars(params)
args = params
return self.__class__(self.__name__,
(self,) + self.__bases__,
self.__bases__,
dict(self.__dict__),
tvars=tvars,
args=args,
Expand Down
13 changes: 8 additions & 5 deletions src/typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -939,10 +939,6 @@ class GenericMeta(TypingMeta, abc.ABCMeta):

def __new__(cls, name, bases, namespace,
tvars=None, args=None, origin=None, extra=None):
if extra is not None and type(extra) is abc.ABCMeta and extra not in bases:
bases = (extra,) + bases
self = super().__new__(cls, name, bases, namespace, _root=True)

if tvars is not None:
# Called from __getitem__() below.
assert origin is not None
Expand Down Expand Up @@ -983,6 +979,13 @@ def __new__(cls, name, bases, namespace,
", ".join(str(g) for g in gvars)))
tvars = gvars

if extra is not None and type(extra) is abc.ABCMeta and extra not in bases:
bases = (extra,) + bases
bases = tuple(_gorg(b) if isinstance(b, GenericMeta) else b for b in bases)
if any(isinstance(b, GenericMeta) and b is not Generic for b in bases):
bases = tuple(b for b in bases if b is not Generic)
self = super().__new__(cls, name, bases, namespace, _root=True)

self.__parameters__ = tvars
self.__args__ = args
self.__origin__ = origin
Expand Down Expand Up @@ -1071,7 +1074,7 @@ def __getitem__(self, params):
tvars = _type_vars(params)
args = params
return self.__class__(self.__name__,
(self,) + self.__bases__,
self.__bases__,
dict(self.__dict__),
tvars=tvars,
args=args,
Expand Down