Assign screen to builtins so it can be used from imported modules

pgzero/game.py

@@ -2,6 +2,7 @@
 import operator
 import time
 import asyncio
+import builtins
 
 import pygame
 import pgzero.clock
@@ -11,7 +12,6 @@
 from . import constants
 
 
-screen = None
 DISPLAY_FLAGS = 0
 
 
@@ -55,7 +55,6 @@ def reinit_screen(self):
         Return True if the dimensions of the screen changed.
 
         """
-        global screen
         changed = False
         mod = self.mod
 
@@ -74,8 +73,8 @@ def reinit_screen(self):
             if hasattr(self.mod, 'screen'):
                 self.mod.screen.surface = self.screen
             else:
-                self.mod.screen = pgzero.screen.Screen(self.screen)
-            screen = self.screen     # KILL ME
+                screen = pgzero.screen.Screen(self.screen)
+                self.mod.screen = builtins.screen = screen
             self.width = w
             self.height = h
 
@@ -215,7 +214,7 @@ def get_draw_func(self):
 
     def run(self):
         """Invoke the main loop, and then clean up."""
-        loop = asyncio.get_event_loop()
+        loop = asyncio.SelectorEventLoop()
         try:
             loop.run_until_complete(self.run_as_coroutine())
         finally:

test/game_tests/helper.py

@@ -0,0 +1,5 @@
+
+RECT = ZRect(30, 30, 40, 40)
+
+def circle():
+    screen.draw.circle((50, 50), radius=20, color='cyan')

test/game_tests/importing.py

@@ -0,0 +1,8 @@
+import helper
+
+assert helper.RECT
+
+
+def draw():
+    helper.circle()
+

test/test_runner.py

@@ -21,3 +21,9 @@ def test_run(self):
         clock.schedule_unique(sys.exit, 0.05)
         with self.assertRaises(SystemExit):
             load_and_run(str(game_tests / 'utf8.py'))
+
+    def test_import(self):
+        """Games can import other modules, which can acccess the builtins."""
+        clock.schedule_unique(sys.exit, 0.05)
+        with self.assertRaises(SystemExit):
+            load_and_run(str(game_tests / 'importing.py'))