python-history
diff --git a/‎v3/example-code/closures/closure1.golden‎
Lines changed: 16 additions & 16 deletions b/‎v3/example-code/closures/closure1.golden‎
Lines changed: 16 additions & 16 deletions
diff --git a/‎v3/example-code/py_tutorial.golden‎
Lines changed: 2 additions & 2 deletions b/‎v3/example-code/py_tutorial.golden‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎v3/pg_logger.py‎
Lines changed: 10 additions & 2 deletions b/‎v3/pg_logger.py‎
Lines changed: 10 additions & 2 deletions
@@ -250,13 +250,13 @@
         }
       ], 
       "globals": {
-        "foo": [
-          "REF", 
-          1
-        ], 
         "b": [
           "REF", 
           2
+        ], 
+        "foo": [
+          "REF", 
+          1
         ]
       }, 
       "heap": {
@@ -326,13 +326,13 @@
         }
       ], 
       "globals": {
-        "foo": [
-          "REF", 
-          1
-        ], 
         "b": [
           "REF", 
           2
+        ], 
+        "foo": [
+          "REF", 
+          1
         ]
       }, 
       "heap": {
@@ -402,13 +402,13 @@
         }
       ], 
       "globals": {
-        "foo": [
-          "REF", 
-          1
-        ], 
         "b": [
           "REF", 
           2
+        ], 
+        "foo": [
+          "REF", 
+          1
         ]
       }, 
       "heap": {
@@ -480,13 +480,13 @@
         }
       ], 
       "globals": {
-        "foo": [
-          "REF", 
-          1
-        ], 
         "b": [
           "REF", 
           2
+        ], 
+        "foo": [
+          "REF", 
+          1
         ]
       }, 
       "heap": {
 
@@ -4661,7 +4661,7 @@
           4
         ], 
         "middleName": "Birchard", 
-        "s2": "Rutherford Birchard Hayes", 
+        "lastName": "Hayes", 
         "age": 26, 
         "orderedUniqueAges": [
           "REF", 
@@ -4678,7 +4678,7 @@
         "person": "Tom Cruise", 
         "s": "Rutherford Birchard Hayes", 
         "b": "Ringo", 
-        "lastName": "Hayes", 
+        "s2": "Rutherford Birchard Hayes", 
         "thisAge": 28, 
         "pi": 3.142, 
         "worth": 40000000
 
@@ -206,7 +206,7 @@ def mouse_input_wrapper(prompt=''):
   BANNED_BUILTINS.append('input')
 
 
-IGNORE_VARS = set(('__user_stdout__', '__builtins__', '__name__', '__exception__', '__doc__', '__package__'))
+IGNORE_VARS = set(('__user_stdout__', '__OPT_toplevel__', '__builtins__', '__name__', '__exception__', '__doc__', '__package__'))
 
 def get_user_stdout(frame):
   return frame.f_globals['__user_stdout__'].getvalue()
@@ -557,6 +557,12 @@ def interaction(self, frame, traceback, event_type):
         if top_frame.f_code.co_name == '__repr__':
           return
 
+        # if top_frame.f_globals doesn't contain the sentinel '__OPT_toplevel__',
+        # then we're in another global scope altogether, so skip it!
+        # (this comes up in tests/backend-tests/namedtuple.txt)
+        if '__OPT_toplevel__' not in top_frame.f_globals:
+          return
+
 
         # OLD CODE -- bail if any element on the stack matches these conditions
         # note that the old code passes tests/backend-tests/namedtuple.txt
@@ -1047,7 +1053,9 @@ def _runscript(self, script_str, custom_globals=None):
 
         user_globals = {"__name__"    : "__main__",
                         "__builtins__" : user_builtins,
-                        "__user_stdout__" : user_stdout}
+                        "__user_stdout__" : user_stdout,
+                        # sentinel value for frames deriving from a top-level module
+                        "__OPT_toplevel__": True}
 
         if custom_globals:
             user_globals.update(custom_globals)