Spare code fixes

3 files changed, 4 insertions, 18 deletions

diff --git a/module/plugins/internal/Notifier.py b/module/plugins/internal/Notifier.py
index 2cffb6ac1..e9f1fab74 100644
--- a/module/plugins/internal/Notifier.py
+++ b/module/plugins/internal/Notifier.py
@@ -2,8 +2,8 @@
 
 import time
 
-from module.plugins.internal.Addon import Addon
-from module.plugins.internal.misc import Expose, encode, isiterable
+from module.plugins.internal.Addon import Addon, Expose
+from module.plugins.internal.misc import encode, isiterable
 
 
 class Notifier(Addon):
diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 82b596aff..dabf1457a 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -247,6 +247,7 @@ class XFSHoster(SimpleHoster):
             self.log_debug("ReCaptcha key: %s" % captcha_key)
 
         if captcha_key:
+            self.captcha = recaptcha
             inputs['recaptcha_response_field'], inputs['recaptcha_challenge_field'] = recaptcha.challenge(captcha_key)
             return
 
@@ -261,4 +262,5 @@ class XFSHoster(SimpleHoster):
             self.log_debug("SolveMedia key: %s" % captcha_key)
 
         if captcha_key:
+            self.captcha = solvemedia
             inputs['adcopy_response'], inputs['adcopy_challenge'] = solvemedia.challenge(captcha_key)
diff --git a/module/plugins/internal/misc.py b/module/plugins/internal/misc.py
index 864e5dd6f..9085106cd 100644
--- a/module/plugins/internal/misc.py
+++ b/module/plugins/internal/misc.py
@@ -84,22 +84,6 @@ class SimpleQueue(object):
         return self.set(queue)
 
 
-class Expose(object):
-    """
-    Used for decoration to declare rpc services
-    """
-    def __new__(cls, f, *args, **kwargs):
-        hookManager.addRPC(f.__module__, f.func_name, f.func_doc)
-        return f
-
-
-def threaded(fn):
-    def run(*args, **kwargs):
-        hookManager.startThread(fn, *args, **kwargs)
-
-    return run
-
-
 def lock(fn):
     def new(*args):
         args[0].lock.acquire()