[Python-checkins] cpython (merge 3.6 -> default): Issue #28649: fix second issue with _ForwardRef (#328) (3.6->3.7)

[guido.van.rossum]

https://hg.python.org/cpython/rev/84b4ac243508
changeset:   105038:84b4ac243508
parent:      105035:304f017462e4
parent:      105037:0f863906cf2e
user:        Guido van Rossum <guido at python.org>
date:        Thu Nov 10 08:29:20 2016 -0800
summary:
  Issue #28649: fix second issue with _ForwardRef (#328) (3.6->3.7)

files:
  Lib/typing.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/typing.py b/Lib/typing.py
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -218,7 +218,7 @@
         self.__forward_value__ = None
 
     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:

-- 
Repository URL: https://hg.python.org/cpython