Spare code fixes

8 files changed, 17 insertions, 22 deletions

diff --git a/module/plugins/hooks/BypassCaptcha.py b/module/plugins/hooks/BypassCaptcha.py
index bc34f1239..bc28b1469 100644
--- a/module/plugins/hooks/BypassCaptcha.py
+++ b/module/plugins/hooks/BypassCaptcha.py
@@ -4,8 +4,7 @@ import pycurl
 
 from module.network.HTTPRequest import BadHeader
 from module.network.RequestFactory import getRequest as get_request
-from module.plugins.internal.Addon import Addon
-from module.plugins.internal.misc import threaded
+from module.plugins.internal.Addon import Addon, threaded
 
 
 class BypassCaptchaException(Exception):
@@ -126,7 +125,7 @@ class BypassCaptcha(Addon):
 
 
     @threaded
-    def _process_captcha(self, task)
+    def _process_captcha(self, task):
         c = task.captchaFile
         try:
             ticket, result = self.submit(c)
diff --git a/module/plugins/hooks/Captcha9Kw.py b/module/plugins/hooks/Captcha9Kw.py
index b269750ba..714be8bc4 100644
--- a/module/plugins/hooks/Captcha9Kw.py
+++ b/module/plugins/hooks/Captcha9Kw.py
@@ -7,8 +7,7 @@ import re
 import time
 
 from module.network.HTTPRequest import BadHeader
-from module.plugins.internal.Addon import Addon
-from module.plugins.internal.misc import threaded
+from module.plugins.internal.Addon import Addon, threaded
 
 
 class Captcha9Kw(Addon):
@@ -55,7 +54,7 @@ class Captcha9Kw(Addon):
 
 
     @threaded
-    def _process_captcha(self, task)
+    def _process_captcha(self, task):
         try:
             with open(task.captchaFile, 'rb') as f:
                 data = f.read()
diff --git a/module/plugins/hooks/CaptchaBrotherhood.py b/module/plugins/hooks/CaptchaBrotherhood.py
index ba29d809e..15546c63f 100644
--- a/module/plugins/hooks/CaptchaBrotherhood.py
+++ b/module/plugins/hooks/CaptchaBrotherhood.py
@@ -15,8 +15,7 @@ except ImportError:
     import Image
 
 from module.network.RequestFactory import getRequest as get_request
-from module.plugins.internal.Addon import Addon
-from module.plugins.internal.misc import threaded
+from module.plugins.internal.Addon import Addon, threaded
 
 
 class CaptchaBrotherhoodException(Exception):
@@ -161,7 +160,7 @@ class CaptchaBrotherhood(Addon):
 
 
     @threaded
-    def _process_captcha(self, task)
+    def _process_captcha(self, task):
         c = task.captchaFile
         try:
             ticket, result = self.submit(c)
diff --git a/module/plugins/hooks/DeathByCaptcha.py b/module/plugins/hooks/DeathByCaptcha.py
index 0e94c9cda..62cfe7d16 100644
--- a/module/plugins/hooks/DeathByCaptcha.py
+++ b/module/plugins/hooks/DeathByCaptcha.py
@@ -10,8 +10,8 @@ import pycurl
 
 from module.network.HTTPRequest import BadHeader
 from module.network.RequestFactory import getRequest as get_request
-from module.plugins.internal.Addon import Addon
-from module.plugins.internal.misc import json, threaded
+from module.plugins.internal.Addon import Addon, threaded
+from module.plugins.internal.misc import json
 
 
 class DeathByCaptchaException(Exception):
@@ -209,7 +209,7 @@ class DeathByCaptcha(Addon):
 
 
     @threaded
-    def _process_captcha(self, task)
+    def _process_captcha(self, task):
         c = task.captchaFile
         try:
             ticket, result = self.submit(c)
diff --git a/module/plugins/hooks/ExpertDecoders.py b/module/plugins/hooks/ExpertDecoders.py
index 9c7f129cb..9b29aa8c5 100644
--- a/module/plugins/hooks/ExpertDecoders.py
+++ b/module/plugins/hooks/ExpertDecoders.py
@@ -9,8 +9,7 @@ import pycurl
 
 from module.network.HTTPRequest import BadHeader
 from module.network.RequestFactory import getRequest as get_request
-from module.plugins.internal.Addon import Addon
-from module.plugins.internal.misc import threaded
+from module.plugins.internal.Addon import Addon, threaded
 
 
 class ExpertDecoders(Addon):
@@ -45,7 +44,7 @@ class ExpertDecoders(Addon):
 
 
     @threaded
-    def _process_captcha(self, task)
+    def _process_captcha(self, task):
         task.data['ticket'] = ticket = uuid.uuid4()
         result = None
 
diff --git a/module/plugins/hooks/ExternalScripts.py b/module/plugins/hooks/ExternalScripts.py
index e77514bb5..b8b79027e 100644
--- a/module/plugins/hooks/ExternalScripts.py
+++ b/module/plugins/hooks/ExternalScripts.py
@@ -3,8 +3,8 @@
 import os
 import subprocess
 
-from module.plugins.internal.Addon import Addon
-from module.plugins.internal.misc import Expose, encode, fsjoin
+from module.plugins.internal.Addon import Addon, Expose
+from module.plugins.internal.misc import encode, fsjoin
 
 
 class ExternalScripts(Addon):
diff --git a/module/plugins/hooks/ImageTyperz.py b/module/plugins/hooks/ImageTyperz.py
index 864eb476e..5afeb4a78 100644
--- a/module/plugins/hooks/ImageTyperz.py
+++ b/module/plugins/hooks/ImageTyperz.py
@@ -8,8 +8,7 @@ import re
 import pycurl
 
 from module.network.RequestFactory import getRequest as get_request
-from module.plugins.internal.Addon import Addon
-from module.plugins.internal.misc import threaded
+from module.plugins.internal.Addon import Addon, threaded
 
 
 class ImageTyperzException(Exception):
@@ -146,7 +145,7 @@ class ImageTyperz(Addon):
 
 
     @threaded
-    def _process_captcha(self, task)
+    def _process_captcha(self, task):
         c = task.captchaFile
         try:
             ticket, result = self.submit(c)
diff --git a/module/plugins/hooks/LogMarker.py b/module/plugins/hooks/LogMarker.py
index e51fa6e3d..3889ce288 100644
--- a/module/plugins/hooks/LogMarker.py
+++ b/module/plugins/hooks/LogMarker.py
@@ -2,8 +2,8 @@
 
 import datetime
 
-from module.plugins.internal.Addon import Addon
-from module.plugins.internal.misc import Expose, seconds_to_nexthour
+from module.plugins.internal.Addon import Addon, Expose
+from module.plugins.internal.misc import seconds_to_nexthour
 
 
 class LogMarker(Addon):