Merge branch 'obi/master'

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

diff --git a/lib/python/Components/Console.py b/lib/python/Components/Console.py
index 7efdf64e991c29e26434bd4be9182d44c34673c6..a41317eabc2b66c2d7f1159e760a6412038ae0b9 100755 (executable)
--- a/lib/python/Components/Console.py
+++ b/lib/python/Components/Console.py
@@ -57,6 +57,10 @@ class Console(object):
                del self.callbacks[name]
 
        def kill(self,name):
-               if self.appContainers.has_key(name):
+               if name in self.appContainers:
                        print "[Console] killing: ",self.appContainers[name]
                        self.appContainers[name].kill()
+
+       def killAll(self):
+               for name in self.appContainers:
+                       self.kill(name)