add Plugins.__init__()

6 files changed, 9 insertions, 3 deletions

diff --git a/plugins/accelerometer/accelerometer.py b/plugins/accelerometer/accelerometer.py
index 26aefd4..c364235 100644
--- a/plugins/accelerometer/accelerometer.py
+++ b/plugins/accelerometer/accelerometer.py
@@ -35,6 +35,7 @@ ACCELEROMETER_DEVICE = '/sys/devices/platform/lis3lv02d/position'
 class Accelerometer(Plugin):
 
     def __init__(self, parent):
+        Plugin.__init__(self)
         self._parent = parent
         if os.path.exists(ACCELEROMETER_DEVICE):
             self._status = True
diff --git a/plugins/audio_sensors/audio_sensors.py b/plugins/audio_sensors/audio_sensors.py
index 8d45395..1e0ed01 100644
--- a/plugins/audio_sensors/audio_sensors.py
+++ b/plugins/audio_sensors/audio_sensors.py
@@ -57,6 +57,7 @@ def _avg(array, abs_value=False):
 class Audio_sensors(Plugin):
 
     def __init__(self, parent):
+        Plugin.__init__(self)
         self._parent = parent
         self._status = True  # TODO: test for audio device
         # These flags are referenced by audiograb
diff --git a/plugins/camera_sensor/camera_sensor.py b/plugins/camera_sensor/camera_sensor.py
index 6509a88..585174c 100644
--- a/plugins/camera_sensor/camera_sensor.py
+++ b/plugins/camera_sensor/camera_sensor.py
@@ -39,6 +39,7 @@ from TurtleArt.taconstants import MEDIA_SHAPES, NO_IMPORT, SKIN_PATHS, \
 class Camera_sensor(Plugin):
 
     def __init__(self, parent):
+        Plugin.__init__(self)
         ''' Make sure there is a camera device '''
         self._parent = parent
         self._status = False
diff --git a/plugins/light_sensor/light_sensor.py b/plugins/light_sensor/light_sensor.py
index bd5655e..97ab6b6 100644
--- a/plugins/light_sensor/light_sensor.py
+++ b/plugins/light_sensor/light_sensor.py
@@ -35,6 +35,7 @@ LIGHT_SENSOR_DEVICE = '/sys/devices/platform/olpc-ols.0/level'
 class Light_sensor(Plugin):
 
     def __init__(self, parent):
+        Plugin.__init__(self)
         self._parent = parent
         if os.path.exists(LIGHT_SENSOR_DEVICE):
             self._status = True
diff --git a/plugins/rfid/rfid.py b/plugins/rfid/rfid.py
index de96a1f..1b3bc48 100644
--- a/plugins/rfid/rfid.py
+++ b/plugins/rfid/rfid.py
@@ -41,6 +41,7 @@ REGEXP_SERUSB = '\/org\/freedesktop\/Hal\/devices\/usb_device['\
 class Rfid(Plugin):
 
     def __init__(self, parent):
+        Plugin.__init__(self)
         self._parent = parent
         self._status = False
 
diff --git a/plugins/turtle_blocks_extras/turtle_blocks_extras.py b/plugins/turtle_blocks_extras/turtle_blocks_extras.py
index 465e07a..c900a3c 100644
--- a/plugins/turtle_blocks_extras/turtle_blocks_extras.py
+++ b/plugins/turtle_blocks_extras/turtle_blocks_extras.py
@@ -49,6 +49,7 @@ class Turtle_blocks_extras(Plugin):
     from Turtle Art """
 
     def __init__(self, turtle_window):
+        Plugin.__init__(self)
         self.tw = turtle_window
 
     def setup(self):
@@ -298,7 +299,6 @@ complete'))
                           help_string=_('resume playing video or audio'))
         self.tw.lc.def_prim('mediaplay', 0, self.tw.lc.media_play, True)
 
-        primitive_dictionary['speak'] = self._prim_speak
         palette.add_block('speak',
                           style='basic-style-1arg',
                           label=_('speak'),
@@ -306,7 +306,8 @@ complete'))
                           default=_('hello'),
                           help_string=_('speaks text'))
         self.tw.lc.def_prim('speak', 1,
-                            lambda self, x: primitive_dictionary['speak'](x))
+                            Primitive(self.prim_speak,
+                                      arg_descs=[ArgSlot(TYPE_STRING)]))
 
         primitive_dictionary['sinewave'] = self._prim_sinewave
         palette.add_block('sinewave',
@@ -1155,7 +1156,7 @@ Journal objects'))
         """ Save SVG to file """
         self.tw.save_as_image(name, svg=True)
 
-    def _prim_speak(self, text):
+    def prim_speak(self, text):
         """ Speak text """
         if type(text) == float and int(text) == text:
             text = int(text)