Commitbaf2d91

Guido van Rossum

committed

Backport fix for#192 to Python 2. Remove optimistic TODO about#196.

1 parent238502e commitbaf2d91Copy full SHA for baf2d91

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 0 deletions

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1093,7 +1093,11 @@ def __new__(cls, args, *kwds):`
`1093`	`1093`	`fori,cinenumerate(cls.__mro__[:-1]):`
`1094`	`1094`	`ifisinstance(c,GenericMeta)and_gorg(c)isGeneric:`
`1095`	`1095`	`next_in_mro=cls.__mro__[i+1]`
`1096`		`-returnnext_in_mro.__new__(_gorg(cls))`
	`1096`	`+origin=_gorg(cls)`
	`1097`	`+obj=next_in_mro.__new__(origin)`
	`1098`	`+iforiginisnotcls:`
	`1099`	`+obj.__init__(args,*kwds)`
	`1100`	`+returnobj`
`1097`	`1101`
`1098`	`1102`
`1099`	`1103`	`defcast(typ,val):`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1069,8 +1069,6 @@ def lookup_name(mapping: Mapping[X, Y], key: X, default: Y) -> Y:`
`1069`	`1069`
`1070`	`1070`	`__slots__= ()`
`1071`	`1071`
`1072`		`-# TODO: GenericMeta should compute next_in_mro and stuff its`
`1073`		`-# __new__ in the class dict, if origin is cls. Issue #196.`
`1074`	`1072`	`def__new__(cls,args,*kwds):`
`1075`	`1073`	`next_in_mro=object`
`1076`	`1074`	`# Look for the last occurrence of Generic or Generic[...].`

Comments

(0)