Make code more compact and test less variable.

src/Zope2/utilities/tests/test_zconsole.py

@@ -21,14 +21,15 @@
 
 test_script = """
 import sys
-import Testing
+import OFS.PropertyManager
 
 
 
 def print_info():
     # This tests the availability of global variables and imports.
     print(sys.argv[1:])
-    print(Testing.__doc__[:7])  # `Set up`
+    # 'ExtensionClass'
+    print(OFS.PropertyManager.PropertyManager.__class__.__name__)
 
 if __name__ == '__main__':
     app.foo = '42'
@@ -82,6 +83,7 @@ def test_runscript(self):
         finally:
             sys.argv = self.stored_sys_argv
             sys.stdout = self.stored_stdout
-        expected = "42\n['run', '{}', '{}', 'bar', 'baz']\n\nSet up\n".format(
-            self.zopeconf, script)
+        expected = (
+            "42\n['run', '{}', '{}', 'bar', 'baz']\nExtensionClass\n").format(
+                self.zopeconf, script)
         self.assertEqual(expected, got)

src/Zope2/utilities/zconsole.py

@@ -15,9 +15,7 @@ def runscript(zopeconf, script_name, *extra_args):
     app.REQUEST['PARENTS'] = [app]
     setRequest(app.REQUEST)
     newSecurityManager(None, user)
-    scriptglobals = {}
-    scriptglobals.update(__name__='__main__')
-    scriptglobals.update(app=app)
+    scriptglobals = {'__name__': '__main__', 'app': app}
     with open(script_name) as script:
         scriptcode = script.read()
     exec(compile(scriptcode, script_name, 'exec'), scriptglobals)