diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2009-02-13 01:05:42 +0100 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2009-02-13 01:05:42 +0100 |
| commit | c46312d7f5ce4113ece4c33595b7192eccadcb1d (patch) | |
| tree | e3319cfa0f7cf929f2c2d181f60bf80dc34a7361 /lib/python/Components/ActionMap.py | |
| parent | aed27e79c07f8f2463ccefed5ba5c3e1b4352052 (diff) | |
| parent | c7cadfc8b46d1f6db38fac73624393873cae2ac7 (diff) | |
| download | enigma2-c46312d7f5ce4113ece4c33595b7192eccadcb1d.tar.gz enigma2-c46312d7f5ce4113ece4c33595b7192eccadcb1d.zip | |
Merge branch 'master' of git.opendreambox.org:/git/enigma2
Diffstat (limited to 'lib/python/Components/ActionMap.py')
| -rw-r--r-- | lib/python/Components/ActionMap.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/python/Components/ActionMap.py b/lib/python/Components/ActionMap.py index b65d6ebc..a018983a 100644 --- 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): - 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: @@ -83,7 +83,7 @@ class HelpableActionMap(ActionMap): 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: |