Cleanup (2)

9 files changed, 4 insertions, 31 deletions

diff --git a/pyload/plugin/addon/AndroidPhoneNotify.py b/pyload/plugin/addon/AndroidPhoneNotify.py
index 3fb291e11..8332f668d 100644
--- a/pyload/plugin/addon/AndroidPhoneNotify.py
+++ b/pyload/plugin/addon/AndroidPhoneNotify.py
@@ -75,8 +75,6 @@ class AndroidPhoneNotify(Addon):
 
 
     @Expose
-
-
     def notify(self,
                event,
                msg="",
diff --git a/pyload/plugin/addon/AntiVirus.py b/pyload/plugin/addon/AntiVirus.py
index c6628a684..3866014ee 100644
--- a/pyload/plugin/addon/AntiVirus.py
+++ b/pyload/plugin/addon/AntiVirus.py
@@ -43,8 +43,6 @@ class AntiVirus(Addon):
 
     @Expose
     @threaded
-
-
     def scan(self, pyfile, thread):
         file     = fs_encode(pyfile.plugin.lastDownload)
         filename = os.path.basename(pyfile.plugin.lastDownload)
diff --git a/pyload/plugin/addon/ClickNLoad.py b/pyload/plugin/addon/ClickNLoad.py
index 6a3d5d662..b6448598a 100644
--- a/pyload/plugin/addon/ClickNLoad.py
+++ b/pyload/plugin/addon/ClickNLoad.py
@@ -48,8 +48,6 @@ class ClickNLoad(Addon):
 
 
     @threaded
-
-
     def proxy(self, ip, webport, cnlport):
         time.sleep(10)  #@TODO: Remove in 0.4.10 (implement addon delay on startup)
 
@@ -63,8 +61,6 @@ class ClickNLoad(Addon):
 
 
     @threaded
-
-
     def _server(self, ip, webport, cnlport):
         try:
             dock_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
diff --git a/pyload/plugin/addon/DeleteFinished.py b/pyload/plugin/addon/DeleteFinished.py
index c0a2e8752..b9368a642 100644
--- a/pyload/plugin/addon/DeleteFinished.py
+++ b/pyload/plugin/addon/DeleteFinished.py
@@ -60,9 +60,9 @@ class DeleteFinished(Addon):
 
 
     ## own methods ##
-    @style.queue
 
 
+    @style.queue
     def deleteFinished(self, mode):
         self.c.execute('DELETE FROM packages WHERE NOT EXISTS(SELECT 1 FROM links WHERE package=packages.id AND status NOT IN (%s))' % mode)
         self.c.execute('DELETE FROM links WHERE NOT EXISTS(SELECT 1 FROM packages WHERE id=links.package)')
diff --git a/pyload/plugin/addon/ExtractArchive.py b/pyload/plugin/addon/ExtractArchive.py
index a52b55f0a..b2eeec1a3 100644
--- a/pyload/plugin/addon/ExtractArchive.py
+++ b/pyload/plugin/addon/ExtractArchive.py
@@ -193,8 +193,6 @@ class ExtractArchive(Addon):
 
 
     @threaded
-
-
     def extractQueued(self, thread):
         packages = self.queue.get()
         while packages:
@@ -211,8 +209,6 @@ class ExtractArchive(Addon):
 
 
     @Expose
-
-
     def extractPackage(self, *ids):
         """ Extract packages with given id"""
         for id in ids:
@@ -238,8 +234,6 @@ class ExtractArchive(Addon):
 
 
     @Expose
-
-
     def extract(self, ids, thread=None):  #@TODO: Use pypack, not pid to improve method usability
         if not ids:
             return False
@@ -512,8 +506,6 @@ class ExtractArchive(Addon):
 
 
     @Expose
-
-
     def getPasswords(self, reload=True):
         """ List of saved passwords """
         if reload:
@@ -539,8 +531,6 @@ class ExtractArchive(Addon):
 
 
     @Expose
-
-
     def addPassword(self, password):
         """  Adds a password to saved list"""
         try:
diff --git a/pyload/plugin/addon/MergeFiles.py b/pyload/plugin/addon/MergeFiles.py
index e7da4a82a..dfc5f41d4 100644
--- a/pyload/plugin/addon/MergeFiles.py
+++ b/pyload/plugin/addon/MergeFiles.py
@@ -26,8 +26,6 @@ class MergeFiles(Addon):
 
 
     @threaded
-
-
     def packageFinished(self, pack):
         files = {}
         fid_dict = {}
diff --git a/pyload/plugin/addon/SkipRev.py b/pyload/plugin/addon/SkipRev.py
index e55d98056..5209da615 100644
--- a/pyload/plugin/addon/SkipRev.py
+++ b/pyload/plugin/addon/SkipRev.py
@@ -25,8 +25,6 @@ class SkipRev(Addon):
 
 
     @staticmethod
-
-
     def _setup(self):
         self.pyfile.plugin._setup()
         if self.pyfile.hasStatus("skipped"):
diff --git a/pyload/plugin/addon/UpdateManager.py b/pyload/plugin/addon/UpdateManager.py
index c7c7ec047..c7fb27a3d 100644
--- a/pyload/plugin/addon/UpdateManager.py
+++ b/pyload/plugin/addon/UpdateManager.py
@@ -82,9 +82,8 @@ class UpdateManager(Addon):
            and time.time() - max(self.MIN_CHECK_INTERVAL, self.getConfig('checkinterval') * 60 * 60) > self.info['last_check']:
             self.update()
 
-    @Expose
-
 
+    @Expose
     def autoreloadPlugins(self):
         """ reload and reindex all modified plugins """
         modules = filter(
@@ -121,10 +120,9 @@ class UpdateManager(Addon):
         except Exception:
             self.logWarning(_("Unable to retrieve server to get updates"))
 
+
     @Expose
     @threaded
-
-
     def update(self):
         """ check for updates """
 
@@ -275,9 +273,8 @@ class UpdateManager(Addon):
         # 2 = Plugins updated, but restart required
         return exitcode
 
-    @Expose
-
 
+    @Expose
     def removePlugins(self, type_plugins):
         """ delete plugins from disk """
 
diff --git a/pyload/plugin/addon/WindowsPhoneNotify.py b/pyload/plugin/addon/WindowsPhoneNotify.py
index f7a5e6ec1..b1d1c8b0f 100644
--- a/pyload/plugin/addon/WindowsPhoneNotify.py
+++ b/pyload/plugin/addon/WindowsPhoneNotify.py
@@ -82,8 +82,6 @@ class WindowsPhoneNotify(Addon):
 
 
     @Expose
-
-
     def notify(self,
                event,
                msg="",