From 166ccf7095475a2a91012e5bda67e0e0aa71627c Mon Sep 17 00:00:00 2001 From: Ivan Levkivskyi Date: Thu, 10 Nov 2016 10:37:22 +0100 Subject: [PATCH] Re-evaluate forward references if non-trivial localns is given --- python2/typing.py | 2 +- src/typing.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python2/typing.py b/python2/typing.py index 695cd27b..14ca180d 100644 --- a/python2/typing.py +++ b/python2/typing.py @@ -214,7 +214,7 @@ def __init__(self, arg): self.__forward_frame__ = frame def _eval_type(self, globalns, localns): - if not self.__forward_evaluated__: + if not self.__forward_evaluated__ or localns is not globalns: if globalns is None and localns is None: globalns = localns = {} elif globalns is None: diff --git a/src/typing.py b/src/typing.py index f3e446e6..e1fe41a3 100644 --- a/src/typing.py +++ b/src/typing.py @@ -225,7 +225,7 @@ def __init__(self, arg): self.__forward_frame__ = frame def _eval_type(self, globalns, localns): - if not self.__forward_evaluated__: + if not self.__forward_evaluated__ or localns is not globalns: if globalns is None and localns is None: globalns = localns = {} elif globalns is None: