Changeset 1146:6b16627388a5

Timestamp:

04/29/08 12:21:58 (2 months ago)

Author:

Ronny Pfannschmidt <Ronny.Pfannschmidt@…>

Message:

removed unused features from actions

Files:

• pida/core/actions.py (modified) (1 diff)
• tests/core/test_actions.py (modified) (2 diffs)

pida/core/actions.py

@@ -132 +132 @@
         act = atype(name=name, label=label, tooltip=tooltip, stock_id=stock_id)
         self._actions.add_action(act)
-        if callback is None:
-            callback = getattr(self, 'act_%s' % name, None)
         if callback is not None:
             act.connect('activate', callback)
-        
-        if accel == 'NOACCEL':
-            warnings.warn('the accel `NOACCEL` is deprecated, use None',
-                    DeprecationWarning, 2)
-
-        if accel != 'NOACCEL' and accel is not None:
+
+        if accel is not None:
             self._create_key_option(act, name, label, tooltip, accel)
 

tests/core/test_actions.py

@@ -10 +10 @@
 
     def create_actions(self):
-        self.create_action('banana', TYPE_NORMAL, 'do a banana', 'bananatt', gtk.STOCK_OPEN)
-        self.create_action('banana2', TYPE_NORMAL, 'do a banana', 'bananatt', gtk.STOCK_OPEN,
+        self.create_action('banana', TYPE_NORMAL, 'do a banana', 'bananatt', gtk.STOCK_OPEN,
             self.my_handler)
-
-    def act_banana(self, action):
-        self.svc.banana = True
 
     def my_handler(self, action):
@@ -41 +37 @@
 
     def test_label(self):
-        self.assertEqual(self._acts.get_action('banana').get_property('label'), 'do a banana')
+        self.assertEqual(self._act.get_property('label'), 'do a banana')
 
     def test_tt(self):
-        self.assertEqual(self._acts.get_action('banana').get_property('tooltip'), 'bananatt')
+        self.assertEqual(self._act.get_property('tooltip'), 'bananatt')
 
     def test_sid(self):
-        self.assertEqual(self._acts.get_action('banana').get_property('stock_id'), gtk.STOCK_OPEN)
+        self.assertEqual(self._act.get_property('stock_id'), gtk.STOCK_OPEN)
 
     def test_action_callback(self):
         self.assertEqual(self.banana, False)
-        self._acts._actions.get_action('banana2').activate()
+        self._act.activate()
         refresh_gui()
         self.assertEqual(self.banana, True)