summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--module/plugins/hooks/CaptchaTrader.py6
-rw-r--r--module/plugins/hooks/ExternalScripts.py3
-rwxr-xr-xpyLoadCore.py2
3 files changed, 5 insertions, 6 deletions
diff --git a/module/plugins/hooks/CaptchaTrader.py b/module/plugins/hooks/CaptchaTrader.py
index 62ac2c8cc..c41ed9f97 100644
--- a/module/plugins/hooks/CaptchaTrader.py
+++ b/module/plugins/hooks/CaptchaTrader.py
@@ -45,7 +45,7 @@ class CaptchaTraderException(Exception):
class CaptchaTrader(Hook):
__name__ = "CaptchaTrader"
- __version__ = "0.12"
+ __version__ = "0.13"
__description__ = """send captchas to captchatrader.com"""
__config__ = [("activated", "bool", "Activated", True),
("username", "str", "Username", ""),
@@ -100,7 +100,7 @@ class CaptchaTrader(Hook):
ticket = response[0]
result = response[1]
- self.log.debug("CaptchaTrader result %s : %s" % (ticket,result))
+ self.logDebug("result %s : %s" % (ticket,result))
return ticket, result
@@ -129,7 +129,7 @@ class CaptchaTrader(Hook):
start_new_thread(self.processCaptcha, (task,))
else:
- self.log.info(_("Your CaptchaTrader Account has not enough credits"))
+ self.logInfo(_("Your CaptchaTrader Account has not enough credits"))
def captchaCorrect(self, task):
if task.data.has_key("ticket"):
diff --git a/module/plugins/hooks/ExternalScripts.py b/module/plugins/hooks/ExternalScripts.py
index 13860e514..f755ffb7a 100644
--- a/module/plugins/hooks/ExternalScripts.py
+++ b/module/plugins/hooks/ExternalScripts.py
@@ -72,8 +72,7 @@ class ExternalScripts(Hook):
try:
cmd = [script] + [str(x) if type(x) != basestring else x for x in args]
#output goes to pyload
- out = subprocess.Popen(cmd, bufsize=-1)
- out.wait()
+ subprocess.Popen(cmd, bufsize=-1)
except Exception, e:
self.logError(_("Error in %s: %s") % (basename(script), str(e)))
diff --git a/pyLoadCore.py b/pyLoadCore.py
index 561bf3466..b0196c3c5 100755
--- a/pyLoadCore.py
+++ b/pyLoadCore.py
@@ -20,7 +20,7 @@
@author: mkaay
@version: v0.4.6
"""
-CURRENT_VERSION = '0.4.6'
+CURRENT_VERSION = '0.4.6-dev'
import __builtin__