Changeset 209:ad1d3de210cd

Timestamp:

Sep 3, 2013, 9:45:56 PM (7 years ago)

Author:

Stefano Rivera <stefano@…>

Branch:

default

rebase_source:

f1360a9f17513461c73dc5956d46723e00073e5c

Message:

Drop compatibility imports, and allow an optional module on classnames

Files:

• data/levels/level1 (modified) (1 diff)
• data/levels/level2 (modified) (1 diff)
• nagslang/game_object.py (modified) (1 diff)
• nagslang/level.py (modified) (1 diff)
• nagslang/tests/test_level.py (modified) (3 diffs)

data/levels/level1

@@ -28 +28 @@
   name: light2
 - args: [light_switch, door_switch]
-  classname: StateLogicalAndPuzzler
+  classname: puzzle.StateLogicalAndPuzzler
   name: both_switches
 - args:

data/levels/level2

@@ -7 +7 @@
   - [600, 700]
   classname: Door
+lines: []
 polygons:
   1:

nagslang/game_object.py

@@ -10 +10 @@
 from nagslang.events import DoorEvent
 from nagslang.widgets.text import LabelWidget
-
-
-# For levels to import, until we get module names in 'classname'
-StateProxyPuzzler = puzzle.StateProxyPuzzler
-StateLogicalAndPuzzler = puzzle.StateLogicalAndPuzzler
-CollidePuzzler = puzzle.CollidePuzzler
 
 

nagslang/level.py

@@ -73 +73 @@
 
     def _create_game_object(self, space, classname, args, name=None):
-        # We should probably build a registry of game objects or something.
-        # At least this is better than just calling `eval`, right?
-        cls = getattr(go, classname)
+        modules = {
+            'game_object': go,
+            'puzzle': puzzle,
+        }
+        if '.' in classname:
+            module, classname = classname.split('.')
+        else:
+            module = 'game_object'
+        cls = getattr(modules[module], classname)
+
         if issubclass(cls, puzzle.Puzzler):
             gobj = cls(*args)

nagslang/tests/test_level.py

@@ -4 +4 @@
 
 from nagslang import game_object as go
+from nagslang import puzzle
 from nagslang.level import Level
 from nagslang.yamlish import load
@@ -77 +78 @@
                              sorted(puzzle_bits.keys()))
             self.assertTrue(
-                isinstance(puzzle_bits['foo_proxy'], go.StateProxyPuzzler))
+                isinstance(puzzle_bits['foo_proxy'], puzzle.StateProxyPuzzler))
             self.assertEqual('foo', puzzle_bits['foo_proxy']._state_source)
-            self.assertTrue(isinstance(puzzle_bits['foo'], go.CollidePuzzler))
+            self.assertTrue(isinstance(puzzle_bits['foo'],
+                                       puzzle.CollidePuzzler))
 
         level = self.make_level('foo', {
@@ -97 +99 @@
                 {
                     'name': 'foo_proxy',
-                    'classname': 'StateProxyPuzzler',
+                    'classname': 'puzzle.StateProxyPuzzler',
                     'args': ['foo'],
                 },