aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Components
diff options
context:
space:
mode:
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>2008-10-28 19:52:04 +0000
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>2008-10-28 19:52:04 +0000
commit1b01c9c3c05fdd42327406161bd5c51e05fbca19 (patch)
tree8a6208b5d1f3001d4263a8634a122f8d1098ff6f /lib/python/Components
parent1aa0603ed3b7ff359f2ebc46f6a97ad6ea009ae6 (diff)
downloadenigma2-1b01c9c3c05fdd42327406161bd5c51e05fbca19.tar.gz
enigma2-1b01c9c3c05fdd42327406161bd5c51e05fbca19.zip
remove non working wrapper class to add a (unneeded) .get() call to
eConsoleAppContainers.. so now all external plugins must remove this .get() calls... example: cont = eConsoleAppContainer() cont.appClosed.append(cb_func) # old was cont.appClosed.get().append(cb_func)
Diffstat (limited to 'lib/python/Components')
-rw-r--r--lib/python/Components/Console.py8
-rw-r--r--lib/python/Components/DreamInfoHandler.py2
-rw-r--r--lib/python/Components/Ipkg.py8
-rw-r--r--lib/python/Components/Network.py8
-rw-r--r--lib/python/Components/Task.py6
5 files changed, 16 insertions, 16 deletions
diff --git a/lib/python/Components/Console.py b/lib/python/Components/Console.py
index 45da72f2..c451eba7 100644
--- a/lib/python/Components/Console.py
+++ b/lib/python/Components/Console.py
@@ -19,8 +19,8 @@ class Console(object):
self.extra_args[name] = extra_args
self.callbacks[name] = callback
self.appContainers[name] = eConsoleAppContainer()
- self.appContainers[name].dataAvail.get().append(boundFunction(self.dataAvailCB,name))
- self.appContainers[name].appClosed.get().append(boundFunction(self.finishedCB,name))
+ self.appContainers[name].dataAvail.append(boundFunction(self.dataAvailCB,name))
+ self.appContainers[name].appClosed.append(boundFunction(self.finishedCB,name))
retval = self.appContainers[name].execute(cmd)
if retval:
self.finishedCB(name, retval)
@@ -29,8 +29,8 @@ class Console(object):
self.appResults[name] += data
def finishedCB(self, name, retval):
- del self.appContainers[name].dataAvail.get()[:]
- del self.appContainers[name].appClosed.get()[:]
+ del self.appContainers[name].dataAvail[:]
+ del self.appContainers[name].appClosed[:]
data = self.appResults[name]
extra_args = self.extra_args[name]
del self.appContainers[name]
diff --git a/lib/python/Components/DreamInfoHandler.py b/lib/python/Components/DreamInfoHandler.py
index 900a2180..c5f82629 100644
--- a/lib/python/Components/DreamInfoHandler.py
+++ b/lib/python/Components/DreamInfoHandler.py
@@ -110,7 +110,7 @@ class DreamInfoHandler:
self.currentlyInstallingMetaIndex = None
self.console = eConsoleAppContainer()
- self.console.appClosed.get().append(self.installNext)
+ self.console.appClosed.append(self.installNext)
self.reloadFavourites = False
self.statusCallback = statusCallback
diff --git a/lib/python/Components/Ipkg.py b/lib/python/Components/Ipkg.py
index 79389b4d..31889bcf 100644
--- a/lib/python/Components/Ipkg.py
+++ b/lib/python/Components/Ipkg.py
@@ -31,8 +31,8 @@ class IpkgComponent:
def runCmd(self, cmd):
print "executing", self.ipkg, cmd
- self.cmd.appClosed.get().append(self.cmdFinished)
- self.cmd.dataAvail.get().append(self.cmdData)
+ self.cmd.appClosed.append(self.cmdFinished)
+ self.cmd.dataAvail.append(self.cmdData)
if self.cmd.execute(self.ipkg + " " + cmd):
self.cmdFinished(-1)
@@ -56,8 +56,8 @@ class IpkgComponent:
def cmdFinished(self, retval):
self.callCallbacks(self.EVENT_DONE)
- self.cmd.appClosed.get().remove(self.cmdFinished)
- self.cmd.dataAvail.get().remove(self.cmdData)
+ self.cmd.appClosed.remove(self.cmdFinished)
+ self.cmd.dataAvail.remove(self.cmdData)
def cmdData(self, data):
print "data:", data
diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py
index ecc54787..9b0898e0 100644
--- a/lib/python/Components/Network.py
+++ b/lib/python/Components/Network.py
@@ -332,13 +332,13 @@ class Network:
def getLinkState(self,iface,callback):
self.dataAvail = callback
cmd = self.ethtool_bin + " " + iface
- self.container.appClosed.get().append(self.cmdFinished)
- self.container.dataAvail.get().append(callback)
+ self.container.appClosed.append(self.cmdFinished)
+ self.container.dataAvail.append(callback)
self.container.execute(cmd)
def cmdFinished(self,retval):
- self.container.appClosed.get().remove(self.cmdFinished)
- self.container.dataAvail.get().remove(self.dataAvail)
+ self.container.appClosed.remove(self.cmdFinished)
+ self.container.dataAvail.remove(self.dataAvail)
def stopContainer(self):
self.container.kill()
diff --git a/lib/python/Components/Task.py b/lib/python/Components/Task.py
index 022ca1f1..7ea64f1a 100644
--- a/lib/python/Components/Task.py
+++ b/lib/python/Components/Task.py
@@ -162,9 +162,9 @@ class Task(object):
self.task_progress_changed = task_progress_changed
from enigma import eConsoleAppContainer
self.container = eConsoleAppContainer()
- self.container.appClosed.get().append(self.processFinished)
- self.container.stdoutAvail.get().append(self.processStdout)
- self.container.stderrAvail.get().append(self.processStderr)
+ self.container.appClosed.append(self.processFinished)
+ self.container.stdoutAvail.append(self.processStdout)
+ self.container.stderrAvail.append(self.processStderr)
assert self.cmd is not None
assert len(self.args) >= 1