Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Optimize ABC caches #383

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 8 commits into from
Feb 10, 2017
Merged

Optimize ABC caches #383

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
313ca43
Optimize ABC negative cache for generics
Feb 1, 2017
6382c8a
Add also positive cache and registry links
Feb 1, 2017
6d1bcf2
Formatting
Feb 1, 2017
c464731
Add ABC optimization to PY2
Feb 1, 2017
423fb75
Inline internal helper for more speed
Feb 1, 2017
f998e24
Fix negative cahce setters
ilevkivskyi Feb 2, 2017
9444b53
Fix negative cahce setters on PY2
ilevkivskyi Feb 2, 2017
0ca5c0b
Make negative caches writable only for non-subscripted generics
ilevkivskyi Feb 2, 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
Inline internal helper for more speed
  • Loading branch information
@ilevkivskyi
Ivan Levkivskyi authored and ilevkivskyi committed Feb 4, 2017
commit 423fb755fed7d8519e00c94f2b17847d3aa65eb1
22 changes: 8 additions & 14 deletions python2/typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -928,19 +928,6 @@ def _next_in_mro(cls):
return next_in_mro


def _valid_for_check(cls):
"""An internal helper to prohibit isinstance([1], List[str]) etc."""
if cls is Generic:
raise TypeError("Class %r cannot be used with class "
"or instance checks" % cls)
if (
cls.__origin__ is not None and
sys._getframe(2).f_globals['__name__'] not in ['abc', 'functools']
):
raise TypeError("Parameterized generics cannot be used with class "
"or instance checks")


def _make_subclasshook(cls):
"""Construct a __subclasshook__ callable that incorporates
the associated __extra__ class in subclass checks performed
Expand Down Expand Up @@ -1210,7 +1197,14 @@ def __getitem__(self, params):
orig_bases=self.__orig_bases__)

def __subclasscheck__(self, cls):
_valid_for_check(self)
if self.__origin__ is not None:
if sys._getframe(1).f_globals['__name__'] not in ['abc', 'functools']:
raise TypeError("Parameterized generics cannot be used with class "
"or instance checks")
return False
if self is Generic:
raise TypeError("Class %r cannot be used with class "
"or instance checks" % self)
return super(GenericMeta, self).__subclasscheck__(cls)

def __instancecheck__(self, instance):
Expand Down
22 changes: 8 additions & 14 deletions src/typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -849,19 +849,6 @@ def _next_in_mro(cls):
return next_in_mro


def _valid_for_check(cls):
"""An internal helper to prohibit isinstance([1], List[str]) etc."""
if cls is Generic:
raise TypeError("Class %r cannot be used with class "
"or instance checks" % cls)
if (
cls.__origin__ is not None and
sys._getframe(2).f_globals['__name__'] not in ['abc', 'functools']
):
raise TypeError("Parameterized generics cannot be used with class "
"or instance checks")


def _make_subclasshook(cls):
"""Construct a __subclasshook__ callable that incorporates
the associated __extra__ class in subclass checks performed
Expand Down Expand Up @@ -1137,7 +1124,14 @@ def __getitem__(self, params):
orig_bases=self.__orig_bases__)

def __subclasscheck__(self, cls):
_valid_for_check(self)
if self.__origin__ is not None:
if sys._getframe(1).f_globals['__name__'] not in ['abc', 'functools']:
raise TypeError("Parameterized generics cannot be used with class "
"or instance checks")
return False
if self is Generic:
raise TypeError("Class %r cannot be used with class "
"or instance checks" % self)
return super().__subclasscheck__(cls)

def __instancecheck__(self, instance):
Expand Down