gras: pythonic work on callable interface

1 files changed, 11 insertions, 11 deletions

diff --git a/tests/block_props_test.py b/tests/block_props_test.py
index 0b068f9..65acaac 100644
--- a/tests/block_props_test.py
+++ b/tests/block_props_test.py
@@ -8,8 +8,8 @@ class MyBlock(gras.Block):
     def __init__(self):
         gras.Block.__init__(self, "MyBlock")
         self.foo = 0
-        self.register_getter("foo", self.get_foo)
-        self.register_setter("foo", self.set_foo)
+        self.register_call("get_foo", self.get_foo)
+        self.register_call("set_foo", self.set_foo)
 
     def work(self, *args): pass
 
@@ -27,10 +27,10 @@ class BlockPropsTest(unittest.TestCase):
         my_block = MyBlock()
         self.assertEqual(my_block.foo, 0)
 
-        my_block.set("foo", 42)
+        my_block.x("set_foo", 42)
         self.assertEqual(my_block.foo, 42)
 
-        my_foo = my_block.get("foo")
+        my_foo = my_block.x("get_foo")
         self.assertEqual(my_foo, 42)
 
     def test_property_errors(self):
@@ -38,13 +38,13 @@ class BlockPropsTest(unittest.TestCase):
 
         #property does not exist
         threw = False
-        try: my_block.get("bar")
+        try: my_block.x("get_bar")
         except: threw = True
         self.assertTrue(threw)
 
         #wrong type for property
         threw = False
-        try: my_block.set("foo", None)
+        try: my_block.x("set_foo", None)
         except: threw = True
         self.assertTrue(threw)
 
@@ -56,17 +56,17 @@ class BlockPropsTest(unittest.TestCase):
         tb.adopt_element("my_hier", hb)
         hb.adopt_element("my_block", my_block)
 
-        my_block.set("foo", 42)
-        self.assertEqual(my_block.get("foo"), 42)
+        my_block.x("set_foo", 42)
+        self.assertEqual(my_block.x("get_foo"), 42)
 
         my_block0 = tb.locate_block('/my_hier/my_block')
-        self.assertEqual(my_block0.get("foo"), 42)
+        self.assertEqual(my_block0.x("get_foo"), 42)
 
         my_block1 = hb.locate_block('my_block')
-        self.assertEqual(my_block1.get("foo"), 42)
+        self.assertEqual(my_block1.x("get_foo"), 42)
 
         my_block2 = hb.locate_block('./../my_hier/my_block')
-        self.assertEqual(my_block2.get("foo"), 42)
+        self.assertEqual(my_block2.x("get_foo"), 42)
 
         threw = False
         try: hb.locate_block('../../my_hier/my_block')