diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2009-02-13 03:47:44 +0100 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2009-02-13 03:47:44 +0100 |
| commit | a4b8eb676ba549ebe8cf347f15888e51d8914789 (patch) | |
| tree | f88416c61e96ec26675c8817a6961a74207f0f7b /lib/python/Components/ActionMap.py | |
| parent | dce87891f204f8e1f7151c4a3ba00b9dd048e795 (diff) | |
| parent | c46312d7f5ce4113ece4c33595b7192eccadcb1d (diff) | |
| download | enigma2-a4b8eb676ba549ebe8cf347f15888e51d8914789.tar.gz enigma2-a4b8eb676ba549ebe8cf347f15888e51d8914789.zip | |
Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs
Conflicts:
lib/python/Screens/InfoBarGenerics.py
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: |