refs bug #429

[enigma2.git] / lib / python / Components / ActionMap.py

diff --git a/lib/python/Components/ActionMap.py b/lib/python/Components/ActionMap.py
index b65d6ebc218ec7f9ced446da62f5d3ed06973c8e..a018983a9e52893dfc6728bbbcc0cac7e557f782 100644 (file)
--- a/lib/python/Components/ActionMap.py
+++ b/lib/python/Components/ActionMap.py
@@ -56,7 +56,7 @@ class ActionMap:
 
 class NumberActionMap(ActionMap):
        def action(self, contexts, action):
 
 class NumberActionMap(ActionMap):
        def action(self, contexts, action):

-               numbers = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"]
+               numbers = ("0", "1", "2", "3", "4", "5", "6", "7", "8", "9")

                if (action in numbers and self.actions.has_key(action)):
                        res = self.actions[action](int(action))
                        if res is not None:
                if (action in numbers and self.actions.has_key(action)):
                        res = self.actions[action](int(action))
                        if res is not None:


@@ -83,7 +83,7 @@ class HelpableActionMap(ActionMap):
                adict = { }
                for (action, funchelp) in actions.iteritems():
                        # check if this is a tuple
                adict = { }
                for (action, funchelp) in actions.iteritems():
                        # check if this is a tuple

-                       if type(funchelp) is type(()):
+                       if isinstance(funchelp, tuple):

                                alist.append((action, funchelp[1]))
                                adict[action] = funchelp[0]
                        else:
                                alist.append((action, funchelp[1]))
                                adict[action] = funchelp[0]
                        else: