Skip to content

Kill __forward_frame__ #327

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
gvanrossum merged 1 commit into from
Nov 10, 2016
Merged

Kill __forward_frame__ #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 1 addition & 8 deletions python2/typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,7 @@ class _ForwardRef(_TypingBase):
"""Wrapper to hold a forward reference."""

__slots__ = ('__forward_arg__', '__forward_code__',
'__forward_evaluated__', '__forward_value__',
'__forward_frame__')
'__forward_evaluated__', '__forward_value__')

def __init__(self, arg):
super(_ForwardRef, self).__init__(arg)
Expand All @@ -206,12 +205,6 @@ def __init__(self, arg):
self.__forward_code__ = code
self.__forward_evaluated__ = False
self.__forward_value__ = None
typing_globals = globals()
frame = sys._getframe(1)
while frame is not None and frame.f_globals is typing_globals:
frame = frame.f_back
assert frame is not None
self.__forward_frame__ = frame

def _eval_type(self, globalns, localns):
if not self.__forward_evaluated__:
Expand Down
13 changes: 3 additions & 10 deletions src/typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,7 @@ class _ForwardRef(_TypingBase, _root=True):
"""Wrapper to hold a forward reference."""

__slots__ = ('__forward_arg__', '__forward_code__',
'__forward_evaluated__', '__forward_value__',
'__forward_frame__')
'__forward_evaluated__', '__forward_value__')

def __init__(self, arg):
super().__init__(arg)
Expand All @@ -217,12 +216,6 @@ def __init__(self, arg):
self.__forward_code__ = code
self.__forward_evaluated__ = False
self.__forward_value__ = None
typing_globals = globals()
frame = sys._getframe(1)
while frame is not None and frame.f_globals is typing_globals:
frame = frame.f_back
assert frame is not None
self.__forward_frame__ = frame

def _eval_type(self, globalns, localns):
if not self.__forward_evaluated__:
Expand All @@ -242,10 +235,10 @@ def __eq__(self, other):
if not isinstance(other, _ForwardRef):
return NotImplemented
return (self.__forward_arg__ == other.__forward_arg__ and
self.__forward_frame__ == other.__forward_frame__)
self.__forward_value__ == other.__forward_value__)

def __hash__(self):
return hash((self.__forward_arg__, self.__forward_frame__))
return hash((self.__forward_arg__, self.__forward_value__))

def __instancecheck__(self, obj):
raise TypeError("Forward references cannot be used with isinstance().")
Expand Down