X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4b131e5355ab67658462b2aa4c5deca0d9188827..0cc396a9dd3478a71b7a0bff4f5a6fdfbc52f22d:/lib/python/Components/ActionMap.py

diff --git a/lib/python/Components/ActionMap.py b/lib/python/Components/ActionMap.py
index d2e908e6..a018983a 100644
--- a/lib/python/Components/ActionMap.py
+++ b/lib/python/Components/ActionMap.py
@@ -1,16 +1,15 @@
-from enigma import *
+from enigma import eActionMap
 
 class ActionMap:
 	def __init__(self, contexts = [ ], actions = { }, prio=0):
 		self.actions = actions
 		self.contexts = contexts
 		self.prio = prio
-		self.p = eActionMapPtr()
+		self.p = eActionMap.getInstance()
 		self.bound = False
 		self.exec_active = False
 		self.enabled = True
-		eActionMap.getInstance(self.p)
-	
+
 	def setEnabled(self, enabled):
 		self.enabled = enabled
 		self.checkBind()
@@ -57,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:
@@ -84,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: