summaryrefslogtreecommitdiffstats
path: root/module/PluginThread.py
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2011-12-22 23:45:38 +0100
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2011-12-22 23:45:38 +0100
commit958bf611f5d9d117f19f824990ec6fd6b537e967 (patch)
tree558cb45fa61b1738629dff9727c028badccd9990 /module/PluginThread.py
parentsome bugfixes (diff)
downloadpyload-958bf611f5d9d117f19f824990ec6fd6b537e967.tar.xz
accountmanager v2, delete your accounts.conf and re-enter them in pyload,
new nice debug functions, try core.shell() and core.breakpoint()
Diffstat (limited to 'module/PluginThread.py')
-rw-r--r--module/PluginThread.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/module/PluginThread.py b/module/PluginThread.py
index e91d6d819..984b88e16 100644
--- a/module/PluginThread.py
+++ b/module/PluginThread.py
@@ -40,7 +40,6 @@ from Api import OnlineStatus
class PluginThread(Thread):
"""abstract base class for thread types"""
- #----------------------------------------------------------------------
def __init__(self, manager):
"""Constructor"""
Thread.__init__(self)
@@ -137,7 +136,7 @@ class PluginThread(Thread):
if pyfile.pluginname in self.m.core.config.plugin:
dump += "\n\nCONFIG: \n\n"
- dump += pformat(self.m.core.config.plugin[pyfile.pluginname]) + "\n"
+ dump += pformat(self.m.core.config.values) + "\n"
return dump
@@ -150,7 +149,6 @@ class PluginThread(Thread):
class DownloadThread(PluginThread):
"""thread for downloading files from 'real' hoster plugins"""
- #----------------------------------------------------------------------
def __init__(self, manager):
"""Constructor"""
PluginThread.__init__(self, manager)
@@ -160,7 +158,6 @@ class DownloadThread(PluginThread):
self.start()
- #----------------------------------------------------------------------
def run(self):
"""run method"""
pyfile = None
@@ -461,7 +458,7 @@ class HookThread(PluginThread):
#dirty method to filter out exceptions
if "unexpected keyword argument 'thread'" not in e.args[0]:
raise
-
+
del self.kwargs["thread"]
self.f(*self.args, **self.kwargs)
finally: