Skip to content

Commit b07b8ea

Browse files
committed
A real fix for python#250
1 parent 4425da9 commit b07b8ea

2 files changed

Lines changed: 22 additions & 12 deletions

File tree

‎python2/typing.py‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,12 +1046,6 @@ class GenericMeta(TypingMeta, abc.ABCMeta):
10461046

10471047
def __new__(cls, name, bases, namespace,
10481048
tvars=None, args=None, origin=None, extra=None):
1049-
if extra is None:
1050-
extra = namespace.get('__extra__')
1051-
if extra is not None and type(extra) is abc.ABCMeta and extra not in bases:
1052-
bases = (extra,) + bases
1053-
self = super(GenericMeta, cls).__new__(cls, name, bases, namespace)
1054-
10551049
if tvars is not None:
10561050
# Called from __getitem__() below.
10571051
assert origin is not None
@@ -1092,6 +1086,17 @@ def __new__(cls, name, bases, namespace,
10921086
", ".join(str(g) for g in gvars)))
10931087
tvars = gvars
10941088

1089+
if extra is None:
1090+
extra = namespace.get('__extra__')
1091+
if extra is not None and type(extra) is abc.ABCMeta and extra not in bases:
1092+
bases = (extra,) + bases
1093+
bases = tuple(b.__origin__ if hasattr(b, '__origin__')
1094+
and b.__origin__ is not None else b for b in bases)
1095+
if any(isinstance(b, GenericMeta) and b is not Generic
1096+
for b in bases):
1097+
bases = tuple(b for b in bases if b is not Generic)
1098+
self = super(GenericMeta, cls).__new__(cls, name, bases, namespace)
1099+
10951100
self.__parameters__ = tvars
10961101
self.__args__ = args
10971102
self.__origin__ = origin
@@ -1180,7 +1185,7 @@ def __getitem__(self, params):
11801185
tvars = _type_vars(params)
11811186
args = params
11821187
return self.__class__(self.__name__,
1183-
(self,) + self.__bases__,
1188+
self.__bases__,
11841189
dict(self.__dict__),
11851190
tvars=tvars,
11861191
args=args,

‎src/typing.py‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -939,10 +939,6 @@ class GenericMeta(TypingMeta, abc.ABCMeta):
939939

940940
def __new__(cls, name, bases, namespace,
941941
tvars=None, args=None, origin=None, extra=None):
942-
if extra is not None and type(extra) is abc.ABCMeta and extra not in bases:
943-
bases = (extra,) + bases
944-
self = super().__new__(cls, name, bases, namespace, _root=True)
945-
946942
if tvars is not None:
947943
# Called from __getitem__() below.
948944
assert origin is not None
@@ -983,6 +979,15 @@ def __new__(cls, name, bases, namespace,
983979
", ".join(str(g) for g in gvars)))
984980
tvars = gvars
985981

982+
if extra is not None and type(extra) is abc.ABCMeta and extra not in bases:
983+
bases = (extra,) + bases
984+
bases = tuple(b.__origin__ if hasattr(b, '__origin__')
985+
and b.__origin__ is not None else b for b in bases)
986+
if any(isinstance(b, GenericMeta) and b is not Generic
987+
for b in bases):
988+
bases = tuple(b for b in bases if b is not Generic)
989+
self = super().__new__(cls, name, bases, namespace, _root=True)
990+
986991
self.__parameters__ = tvars
987992
self.__args__ = args
988993
self.__origin__ = origin
@@ -1071,7 +1076,7 @@ def __getitem__(self, params):
10711076
tvars = _type_vars(params)
10721077
args = params
10731078
return self.__class__(self.__name__,
1074-
(self,) + self.__bases__,
1079+
self.__bases__,
10751080
dict(self.__dict__),
10761081
tvars=tvars,
10771082
args=args,

0 commit comments

Comments
 (0)