eliminated __OPT_toplevel__ hack

pgbovine · pgbovine · commit 4e93e5b7a2e7 · 2017-01-14T18:52:54.000-08:00
diff --git a/v3/example-code/closures/closure1.golden b/v3/example-code/closures/closure1.golden
@@ -250,13 +250,13 @@
         }
       ], 
       "globals": {
-        "b": [
-          "REF", 
-          2
-        ], 
         "foo": [
           "REF", 
           1
+        ], 
+        "b": [
+          "REF", 
+          2
         ]
       }, 
       "heap": {
@@ -326,13 +326,13 @@
         }
       ], 
       "globals": {
-        "b": [
-          "REF", 
-          2
-        ], 
         "foo": [
           "REF", 
           1
+        ], 
+        "b": [
+          "REF", 
+          2
         ]
       }, 
       "heap": {
@@ -402,13 +402,13 @@
         }
       ], 
       "globals": {
-        "b": [
-          "REF", 
-          2
-        ], 
         "foo": [
           "REF", 
           1
+        ], 
+        "b": [
+          "REF", 
+          2
         ]
       }, 
       "heap": {
@@ -480,13 +480,13 @@
         }
       ], 
       "globals": {
-        "b": [
-          "REF", 
-          2
-        ], 
         "foo": [
           "REF", 
           1
+        ], 
+        "b": [
+          "REF", 
+          2
         ]
       }, 
       "heap": {
diff --git a/v3/example-code/closures/closure1.golden_py3 b/v3/example-code/closures/closure1.golden_py3
@@ -250,13 +250,13 @@
         }
       ], 
       "globals": {
-        "b": [
-          "REF", 
-          2
-        ], 
         "foo": [
           "REF", 
           1
+        ], 
+        "b": [
+          "REF", 
+          2
         ]
       }, 
       "heap": {
@@ -326,13 +326,13 @@
         }
       ], 
       "globals": {
-        "b": [
-          "REF", 
-          2
-        ], 
         "foo": [
           "REF", 
           1
+        ], 
+        "b": [
+          "REF", 
+          2
         ]
       }, 
       "heap": {
@@ -402,13 +402,13 @@
         }
       ], 
       "globals": {
-        "b": [
-          "REF", 
-          2
-        ], 
         "foo": [
           "REF", 
           1
+        ], 
+        "b": [
+          "REF", 
+          2
         ]
       }, 
       "heap": {
@@ -480,13 +480,13 @@
         }
       ], 
       "globals": {
-        "b": [
-          "REF", 
-          2
-        ], 
         "foo": [
           "REF", 
           1
+        ], 
+        "b": [
+          "REF", 
+          2
         ]
       }, 
       "heap": {
diff --git a/v3/example-code/py_tutorial.golden b/v3/example-code/py_tutorial.golden
@@ -4661,7 +4661,7 @@
           4
         ], 
         "middleName": "Birchard", 
-        "lastName": "Hayes", 
+        "s2": "Rutherford Birchard Hayes", 
         "age": 26, 
         "orderedUniqueAges": [
           "REF", 
@@ -4678,7 +4678,7 @@
         "person": "Tom Cruise", 
         "s": "Rutherford Birchard Hayes", 
         "b": "Ringo", 
-        "s2": "Rutherford Birchard Hayes", 
+        "lastName": "Hayes", 
         "thisAge": 28, 
         "pi": 3.142, 
         "worth": 40000000
diff --git a/v3/example-code/py_tutorial.golden_py3 b/v3/example-code/py_tutorial.golden_py3
@@ -4661,7 +4661,7 @@
           4
         ], 
         "middleName": "Birchard", 
-        "lastName": "Hayes", 
+        "s2": "Rutherford Birchard Hayes", 
         "age": 26, 
         "orderedUniqueAges": [
           "REF", 
@@ -4678,7 +4678,7 @@
         "person": "Tom Cruise", 
         "s": "Rutherford Birchard Hayes", 
         "b": "Ringo", 
-        "s2": "Rutherford Birchard Hayes", 
+        "lastName": "Hayes", 
         "thisAge": 28, 
         "pi": 3.142, 
         "worth": 40000000
diff --git a/v5-unity/pg_logger.py b/v5-unity/pg_logger.py
@@ -260,7 +260,7 @@ def mouse_input_wrapper(prompt=''):
                    'dir', 'globals', 'locals', 'vars']
 # Peter says 'apply' isn't dangerous, so don't ban it
 
-IGNORE_VARS = set(('__user_stdout__', '__OPT_toplevel__', '__builtins__', '__name__', '__exception__', '__doc__', '__package__'))
+IGNORE_VARS = set(('__user_stdout__', '__builtins__', '__name__', '__exception__', '__doc__', '__package__'))
 
 def get_user_stdout(frame):
   my_user_stdout = frame.f_globals['__user_stdout__']
@@ -728,10 +728,9 @@ 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!
+        # if we're not in a module that we are explicitly tracing, skip:
         # (this comes up in tests/backend-tests/namedtuple.txt)
-        if '__OPT_toplevel__' not in top_frame.f_globals:
+        if top_frame.f_globals['__name__'] != '__main__':
           return
 
 
@@ -1285,9 +1284,7 @@ def _runscript(self, script_str, custom_globals=None):
         # update AFTER custom_globals so that custom_globals doesn't clobber us
         user_globals.update({"__name__"    : "__main__",
                              "__builtins__" : user_builtins,
-                             "__user_stdout__" : user_stdout,
-                             # sentinel value for frames deriving from a top-level module
-                             "__OPT_toplevel__": True})
+                             "__user_stdout__" : user_stdout})
 
         try:
           # enforce resource limits RIGHT BEFORE running script_str
