4 files changed, 12 insertions, 15 deletions
diff --git a/module/plugins/hooks/ExternalScripts.py b/module/plugins/hooks/ExternalScripts.py
index 9c7dbdba8..c78bce5a2 100644
--- a/module/plugins/hooks/ExternalScripts.py
+++ b/module/plugins/hooks/ExternalScripts.py
@@ -10,7 +10,7 @@ from module.plugins.internal.misc import encode
 class ExternalScripts(Addon):
     __name__    = "ExternalScripts"
     __type__    = "hook"
-    __version__ = "0.66"
+    __version__ = "0.67"
     __status__  = "testing"
 
     __config__ = [("activated", "bool", "Activated"                  , True ),
@@ -109,11 +109,9 @@ class ExternalScripts(Addon):
             self.scripts[folder] = scripts
 
     def call_cmd(self, command, *args, **kwargs):
-        _args = ['"' + _arg + '"' if ' ' in encode(_arg) else _arg for _arg in args]
+        call = map(encode, [command] + list(args))
 
-        call = map(encode, [command] + _args)
-
-        self.log_debug("EXECUTE " + " ".join(call))
+        self.log_debug("EXECUTE " + " ".join(['"' + _arg + '"' if ' ' in _arg else _arg for _arg in call]))
 
         p = subprocess.Popen(call, bufsize=-1)  #@NOTE: output goes to pyload
 
diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py
index 6f08d4498..0201362fc 100644
--- a/module/plugins/internal/CaptchaService.py
+++ b/module/plugins/internal/CaptchaService.py
@@ -6,7 +6,7 @@ from module.plugins.internal.Captcha import Captcha
 class CaptchaService(Captcha):
     __name__    = "CaptchaService"
     __type__    = "captcha"
-    __version__ = "0.34"
+    __version__ = "0.35"
     __status__  = "stable"
 
     __description__ = """Base anti-captcha service plugin"""
diff --git a/module/plugins/internal/Plugin.py b/module/plugins/internal/Plugin.py
index a8ef9b4f2..f84d57105 100644
--- a/module/plugins/internal/Plugin.py
+++ b/module/plugins/internal/Plugin.py
@@ -4,24 +4,18 @@ from __future__ import with_statement
 
 import inspect
 import os
+import pycurl
 import re
 
 if os.name != "nt":
     import grp
     import pwd
 
-import pycurl
-try:
-    import send2trash
-except ImportError:
-    pass
-
-import module.plugins.internal.misc as utils
 
 from module.network.RequestFactory import getRequest as get_request
 from module.plugins.Plugin import Abort, Fail, Reconnect, Retry, SkipDownload as Skip  #@TODO: Remove in 0.4.10
 from module.plugins.internal.misc import (Config, DB, decode, encode, exists, fixurl, fsjoin,
-                                          format_exc, html_unescape, parse_html_header, set_cookies)
+                                          format_exc, html_unescape, parse_html_header, remove, set_cookies)
 
 
 class Plugin(object):
@@ -219,7 +213,7 @@ class Plugin(object):
 
         #@TODO: Move to network in 0.4.10
         if isinstance(decode, basestring):
-            html = utils.decode(html, decode)
+            html = decode(html, decode)
 
         self.last_html = html
 
diff --git a/module/plugins/internal/misc.py b/module/plugins/internal/misc.py
index 346424db7..9b70c4b5a 100644
--- a/module/plugins/internal/misc.py
+++ b/module/plugins/internal/misc.py
@@ -28,6 +28,11 @@ try:
 except ImportError:
     import json
 
+try:
+    import send2trash
+except ImportError:
+    pass
+
 
 #@TODO: Remove in 0.4.10
 class misc(object):