Skip to content

Speed improvements for typing #439

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
ilevkivskyi merged 14 commits into from
Jul 17, 2017
Merged

Speed improvements for typing #439

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e416127
Inline _geqv and _gorg
ilevkivskyi Jun 11, 2017
9c60a07
Fix typo
ilevkivskyi Jun 11, 2017
7d192a4
Cut MROs in half
ilevkivskyi Jun 11, 2017
f5881a2
Avoid recursion on _gorg
ilevkivskyi Jun 11, 2017
0318571
Fix lint
ilevkivskyi Jun 11, 2017
e84c51f
Fxi lint (for realz)
ilevkivskyi Jun 11, 2017
b5152e2
Refactor erasure logic to make it clearer (and probably faster)
Jun 12, 2017
369b252
Remove redundant check
Jun 12, 2017
0d3dde6
Remove unnecessary comment
Jun 12, 2017
ba3ffbd
Backport first part to Python 2
Jun 12, 2017
630aeef
Backport second part to Python 2
Jun 12, 2017
995572f
Keep only obvious speed-ups and drop more aggressive optiomizations
Jun 12, 2017
9d54a4a
Fix _Protocol on Python 2
Jun 12, 2017
6b223a1
Address CR
Jun 12, 2017
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
Prev Previous commit
Next Next commit
Refactor erasure logic to make it clearer (and probably faster)
  • Loading branch information
Ivan Levkivskyi
Ivan Levkivskyi committed Jun 12, 2017
commit b5152e2363b30f07a9ca303bf2755590015840db
38 changes: 20 additions & 18 deletions src/typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -966,24 +966,26 @@ def __new__(cls, name, bases, namespace,
tvars = gvars

initial_bases = bases
if extra is not None and type(extra) is abc.ABCMeta and extra not in bases:
bases = (extra,) + bases
new_bases = []
for base in bases:
if isinstance(base, GenericMeta):
bextra = getattr(base, '__extra__', None)
if (extra and bextra and not origin and bextra not in bases and
type(bextra) is abc.ABCMeta):
new_bases.append(bextra)
else:
new_bases.append(base._gorg)
else:
new_bases.append(base)
bases = tuple(new_bases)

# remove bare Generic from bases if there are other generic 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)
if not origin:
# Erase base classes
new_bases = []
for base in bases:
erased = base
if isinstance(base, GenericMeta):
erased = base._gorg
if extra: # Even stronger erasure for generic ABCs in typing
bextra = getattr(base, '__extra__', None)
erased = bextra if bextra else erased
if erased not in new_bases:
new_bases.append(erased)

bases = tuple(new_bases)
if type(extra) is abc.ABCMeta and extra not in bases:
bases = (extra,) + bases

# Remove bare Generic from bases if there are other generic 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)
namespace.update({'__origin__': origin, '__extra__': extra})
self = super().__new__(cls, name, bases, namespace, _root=True)
super(GenericMeta, self).__setattr__('_gorg', self if not origin
Expand Down