Spare code cosmetics

88 files changed, 104 insertions, 99 deletions

diff --git a/module/plugins/crypter/C1NeonCom.py b/module/plugins/crypter/C1NeonCom.py
index 926633ff7..9b6093081 100644
--- a/module/plugins/crypter/C1NeonCom.py
+++ b/module/plugins/crypter/C1NeonCom.py
@@ -9,7 +9,7 @@ class C1NeonCom(DeadCrypter):
     __version__ = "0.05"
 
     __pattern__ = r'http://(?:www\.)?c1neon\.com/.+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """C1neon.com decrypter plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/crypter/CryptItCom.py b/module/plugins/crypter/CryptItCom.py
index 2cf4e9f62..1c9e841b7 100644
--- a/module/plugins/crypter/CryptItCom.py
+++ b/module/plugins/crypter/CryptItCom.py
@@ -9,7 +9,7 @@ class CryptItCom(DeadCrypter):
     __version__ = "0.11"
 
     __pattern__ = r'http://(?:www\.)?crypt-it\.com/(s|e|d|c)/\w+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Crypt-it.com decrypter plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/crypter/DdlstorageComFolder.py b/module/plugins/crypter/DdlstorageComFolder.py
index e02e77fda..dc6ec1da5 100644
--- a/module/plugins/crypter/DdlstorageComFolder.py
+++ b/module/plugins/crypter/DdlstorageComFolder.py
@@ -9,7 +9,7 @@ class DdlstorageComFolder(DeadCrypter):
     __version__ = "0.03"
 
     __pattern__ = r'https?://(?:www\.)?ddlstorage\.com/folder/\w+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """DDLStorage.com folder decrypter plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/crypter/DuploadOrgFolder.py b/module/plugins/crypter/DuploadOrgFolder.py
index 066fbe3d7..d505806b7 100644
--- a/module/plugins/crypter/DuploadOrgFolder.py
+++ b/module/plugins/crypter/DuploadOrgFolder.py
@@ -9,7 +9,7 @@ class DuploadOrgFolder(DeadCrypter):
     __version__ = "0.02"
 
     __pattern__ = r'http://(?:www\.)?dupload\.org/folder/\d+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Dupload.org folder decrypter plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/crypter/FilebeerInfoFolder.py b/module/plugins/crypter/FilebeerInfoFolder.py
index a3c7ee74c..5b401c555 100644
--- a/module/plugins/crypter/FilebeerInfoFolder.py
+++ b/module/plugins/crypter/FilebeerInfoFolder.py
@@ -9,7 +9,7 @@ class FilebeerInfoFolder(DeadCrypter):
     __version__ = "0.02"
 
     __pattern__ = r'http://(?:www\.)?filebeer\.info/\d*~f\w+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Filebeer.info folder decrypter plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/crypter/FilesonicComFolder.py b/module/plugins/crypter/FilesonicComFolder.py
index 8fc28d592..6cd4d8b8c 100644
--- a/module/plugins/crypter/FilesonicComFolder.py
+++ b/module/plugins/crypter/FilesonicComFolder.py
@@ -9,7 +9,7 @@ class FilesonicComFolder(DeadCrypter):
     __version__ = "0.12"
 
     __pattern__ = r'http://(?:www\.)?filesonic\.com/folder/\w+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Filesonic.com folder decrypter plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/crypter/FiredriveComFolder.py b/module/plugins/crypter/FiredriveComFolder.py
index 7d3a357fd..792f3198b 100644
--- a/module/plugins/crypter/FiredriveComFolder.py
+++ b/module/plugins/crypter/FiredriveComFolder.py
@@ -9,7 +9,7 @@ class FiredriveComFolder(DeadCrypter):
     __version__ = "0.03"
 
     __pattern__ = r'https?://(?:www\.)?(firedrive|putlocker)\.com/share/.+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Firedrive.com folder decrypter plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/crypter/HotfileComFolder.py b/module/plugins/crypter/HotfileComFolder.py
index 4f40587ad..f1dd56228 100644
--- a/module/plugins/crypter/HotfileComFolder.py
+++ b/module/plugins/crypter/HotfileComFolder.py
@@ -9,7 +9,7 @@ class HotfileComFolder(DeadCrypter):
     __version__ = "0.30"
 
     __pattern__ = r'https?://(?:www\.)?hotfile\.com/list/\w+/\w+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Hotfile.com folder decrypter plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/crypter/ILoadTo.py b/module/plugins/crypter/ILoadTo.py
index f3415706d..4c7387739 100644
--- a/module/plugins/crypter/ILoadTo.py
+++ b/module/plugins/crypter/ILoadTo.py
@@ -9,7 +9,7 @@ class ILoadTo(DeadCrypter):
     __version__ = "0.11"
 
     __pattern__ = r'http://(?:www\.)?iload\.to/go/\d+-[\w.-]+/'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Iload.to decrypter plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/crypter/LofCc.py b/module/plugins/crypter/LofCc.py
index 3cac0fbf2..62e05f299 100644
--- a/module/plugins/crypter/LofCc.py
+++ b/module/plugins/crypter/LofCc.py
@@ -9,7 +9,7 @@ class LofCc(DeadCrypter):
     __version__ = "0.21"
 
     __pattern__ = r'http://(?:www\.)?lof\.cc/(.+)'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Lof.cc decrypter plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/crypter/MBLinkInfo.py b/module/plugins/crypter/MBLinkInfo.py
index 82c2d9719..7ff400f7e 100644
--- a/module/plugins/crypter/MBLinkInfo.py
+++ b/module/plugins/crypter/MBLinkInfo.py
@@ -9,7 +9,7 @@ class MBLinkInfo(DeadCrypter):
     __version__ = "0.03"
 
     __pattern__ = r'http://(?:www\.)?mblink\.info/?\?id=(\d+)'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """MBLink.info decrypter plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/crypter/MegauploadComFolder.py b/module/plugins/crypter/MegauploadComFolder.py
index 1af9d556d..60e4af57e 100644
--- a/module/plugins/crypter/MegauploadComFolder.py
+++ b/module/plugins/crypter/MegauploadComFolder.py
@@ -9,7 +9,7 @@ class MegauploadComFolder(DeadCrypter):
     __version__ = "0.02"
 
     __pattern__ = r'http://(?:www\.)?megaupload\.com/(\?f|xml/folderfiles\.php\?.*&?folderid)=\w+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Megaupload.com folder decrypter plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/crypter/Movie2KTo.py b/module/plugins/crypter/Movie2KTo.py
index 76bf702ac..919d77c86 100644
--- a/module/plugins/crypter/Movie2KTo.py
+++ b/module/plugins/crypter/Movie2KTo.py
@@ -9,7 +9,7 @@ class Movie2KTo(DeadCrypter):
     __version__ = "0.51"
 
     __pattern__ = r'http://(?:www\.)?movie2k\.to/(.+)\.html'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Movie2k.to decrypter plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/crypter/MultiuploadCom.py b/module/plugins/crypter/MultiuploadCom.py
index 347b7e5af..41794445a 100644
--- a/module/plugins/crypter/MultiuploadCom.py
+++ b/module/plugins/crypter/MultiuploadCom.py
@@ -9,7 +9,7 @@ class MultiuploadCom(DeadCrypter):
     __version__ = "0.02"
 
     __pattern__ = r'http://(?:www\.)?multiupload\.(com|nl)/\w+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """ MultiUpload.com decrypter plugin """
     __license__     = "GPLv3"
diff --git a/module/plugins/crypter/OronComFolder.py b/module/plugins/crypter/OronComFolder.py
index 9e06bdf32..048af7d82 100644
--- a/module/plugins/crypter/OronComFolder.py
+++ b/module/plugins/crypter/OronComFolder.py
@@ -9,7 +9,7 @@ class OronComFolder(DeadCrypter):
     __version__ = "0.11"
 
     __pattern__ = r'http://(?:www\.)?oron\.com/folder/\w+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Oron.com folder decrypter plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/crypter/RSLayerCom.py b/module/plugins/crypter/RSLayerCom.py
index cc3b23bbc..6f078e9e4 100644
--- a/module/plugins/crypter/RSLayerCom.py
+++ b/module/plugins/crypter/RSLayerCom.py
@@ -9,7 +9,7 @@ class RSLayerCom(DeadCrypter):
     __version__ = "0.21"
 
     __pattern__ = r'http://(?:www\.)?rs-layer\.com/directory-'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """RS-Layer.com decrypter plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/crypter/SecuredIn.py b/module/plugins/crypter/SecuredIn.py
index cbfa919ac..a2eac4f13 100644
--- a/module/plugins/crypter/SecuredIn.py
+++ b/module/plugins/crypter/SecuredIn.py
@@ -9,7 +9,7 @@ class SecuredIn(DeadCrypter):
     __version__ = "0.21"
 
     __pattern__ = r'http://(?:www\.)?secured\.in/download-[\d]+-\w{8}\.html'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Secured.in decrypter plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/crypter/SharingmatrixComFolder.py b/module/plugins/crypter/SharingmatrixComFolder.py
index 4448dd691..eb1b4d8a6 100644
--- a/module/plugins/crypter/SharingmatrixComFolder.py
+++ b/module/plugins/crypter/SharingmatrixComFolder.py
@@ -9,7 +9,7 @@ class SharingmatrixComFolder(DeadCrypter):
     __version__ = "0.01"
 
     __pattern__ = r'http://(?:www\.)?sharingmatrix\.com/folder/\w+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Sharingmatrix.com folder decrypter plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/crypter/SpeedLoadOrgFolder.py b/module/plugins/crypter/SpeedLoadOrgFolder.py
index ddde7dec2..af768ef7b 100644
--- a/module/plugins/crypter/SpeedLoadOrgFolder.py
+++ b/module/plugins/crypter/SpeedLoadOrgFolder.py
@@ -9,7 +9,7 @@ class SpeedLoadOrgFolder(DeadCrypter):
     __version__ = "0.30"
 
     __pattern__ = r'http://(?:www\.)?speedload\.org/(\d+~f$|folder/\d+/)'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Speedload decrypter plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/crypter/StealthTo.py b/module/plugins/crypter/StealthTo.py
index 5173421f1..551468980 100644
--- a/module/plugins/crypter/StealthTo.py
+++ b/module/plugins/crypter/StealthTo.py
@@ -9,7 +9,7 @@ class StealthTo(DeadCrypter):
     __version__ = "0.20"
 
     __pattern__ = r'http://(?:www\.)?stealth\.to/folder/.+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Stealth.to decrypter plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/crypter/TrailerzoneInfo.py b/module/plugins/crypter/TrailerzoneInfo.py
index 10780dd45..6f1c90612 100644
--- a/module/plugins/crypter/TrailerzoneInfo.py
+++ b/module/plugins/crypter/TrailerzoneInfo.py
@@ -9,7 +9,7 @@ class TrailerzoneInfo(DeadCrypter):
     __version__ = "0.03"
 
     __pattern__ = r'http://(?:www\.)?trailerzone\.info/.+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """TrailerZone.info decrypter plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/crypter/WiiReloadedOrg.py b/module/plugins/crypter/WiiReloadedOrg.py
index c3c5b8222..eddc0e5d1 100644
--- a/module/plugins/crypter/WiiReloadedOrg.py
+++ b/module/plugins/crypter/WiiReloadedOrg.py
@@ -9,7 +9,7 @@ class WiiReloadedOrg(DeadCrypter):
     __version__ = "0.11"
 
     __pattern__ = r'http://(?:www\.)?wii-reloaded\.org/protect/get\.php\?i=.+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Wii-Reloaded.org decrypter plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/crypter/WuploadComFolder.py b/module/plugins/crypter/WuploadComFolder.py
index c4171667e..dece467a2 100644
--- a/module/plugins/crypter/WuploadComFolder.py
+++ b/module/plugins/crypter/WuploadComFolder.py
@@ -9,7 +9,7 @@ class WuploadComFolder(DeadCrypter):
     __version__ = "0.01"
 
     __pattern__ = r'http://(?:www\.)?wupload\.com/folder/\w+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Wupload.com folder decrypter plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hooks/AndroidPhoneNotify.py b/module/plugins/hooks/AndroidPhoneNotify.py
index 9fea0b8e6..a8a1cff72 100644
--- a/module/plugins/hooks/AndroidPhoneNotify.py
+++ b/module/plugins/hooks/AndroidPhoneNotify.py
@@ -27,12 +27,14 @@ class AndroidPhoneNotify(Hook):
                        ("Walter Purcaro", "vuolter@gmail.com"      )]
 
 
-    event_list = ["allDownloadsProcessed", "plugin_updated"]
     interval   = 0  #@TODO: Remove in 0.4.10
 
 
     def setup(self):
-        self.info          = {}  #@TODO: Remove in 0.4.10
+        self.info = {}  #@TODO: Remove in 0.4.10
+
+        self.event_list = ["allDownloadsProcessed", "plugin_updated"]
+
         self.last_notify   = 0
         self.notifications = 0
 
diff --git a/module/plugins/hooks/DeleteFinished.py b/module/plugins/hooks/DeleteFinished.py
index bde4ca259..be17c3c0f 100644
--- a/module/plugins/hooks/DeleteFinished.py
+++ b/module/plugins/hooks/DeleteFinished.py
@@ -17,14 +17,13 @@ class DeleteFinished(Hook):
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    # event_list = ["pluginConfigChanged"]
-
     MIN_CHECK_INTERVAL = 1 * 60 * 60  #: 1 hour
 
 
     ## overwritten methods ##
     def setup(self):
-        self.info     = {}  #@TODO: Remove in 0.4.10
+        self.info = {}  #@TODO: Remove in 0.4.10
+        # self.event_list = ["pluginConfigChanged"]
         self.interval = self.MIN_CHECK_INTERVAL
 
 
diff --git a/module/plugins/hooks/ExternalScripts.py b/module/plugins/hooks/ExternalScripts.py
index be0857009..a0815499b 100644
--- a/module/plugins/hooks/ExternalScripts.py
+++ b/module/plugins/hooks/ExternalScripts.py
@@ -23,11 +23,6 @@ class ExternalScripts(Hook):
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    event_list = ["archive_extract_failed", "archive_extracted"     ,
-                  "package_extract_failed", "package_extracted"     ,
-                  "all_archives_extracted", "all_archives_processed",
-                  "allDownloadsFinished"  , "allDownloadsProcessed" ,
-                  "packageDeleted"]
     interval   = 0  #@TODO: Remove in 0.4.10
 
 
@@ -35,6 +30,12 @@ class ExternalScripts(Hook):
         self.info    = {'oldip': None}
         self.scripts = {}
 
+        self.event_list = ["archive_extract_failed", "archive_extracted"     ,
+                           "package_extract_failed", "package_extracted"     ,
+                           "all_archives_extracted", "all_archives_processed",
+                           "allDownloadsFinished"  , "allDownloadsProcessed" ,
+                           "packageDeleted"]
+
         folders = ["pyload_start", "pyload_restart", "pyload_stop",
                    "before_reconnect", "after_reconnect",
                    "download_preparing", "download_failed", "download_finished",
diff --git a/module/plugins/hooks/ExtractArchive.py b/module/plugins/hooks/ExtractArchive.py
index 5b9e3f30b..3e371ec2b 100644
--- a/module/plugins/hooks/ExtractArchive.py
+++ b/module/plugins/hooks/ExtractArchive.py
@@ -136,13 +136,12 @@ class ExtractArchive(Hook):
                        ("Immenz"        , "immenz@gmx.net"   )]
 
 
-    event_list = ["allDownloadsProcessed","packageDeleted"]
-
     NAME_REPLACEMENTS = [(r'\.part\d+\.rar$', ".part.rar")]
 
 
     def setup(self):
         self.info = {}  #@TODO: Remove in 0.4.10
+        self.event_list = ["allDownloadsProcessed","packageDeleted"]
 
         self.queue  = ArchiveQueue(self, "Queue")
         self.failed = ArchiveQueue(self, "Failed")
diff --git a/module/plugins/hooks/JustPremium.py b/module/plugins/hooks/JustPremium.py
index d18afc524..f66747f82 100644
--- a/module/plugins/hooks/JustPremium.py
+++ b/module/plugins/hooks/JustPremium.py
@@ -20,12 +20,12 @@ class JustPremium(Hook):
                        ("immenz"        , "immenz@gmx.net"    )]
 
 
-    event_list = ["linksAdded"]
     interval   = 0  #@TODO: Remove in 0.4.10
 
 
     def setup(self):
         self.info = {}  #@TODO: Remove in 0.4.10
+        self.event_list = ["linksAdded"]
 
 
     def linksAdded(self, links, pid):
diff --git a/module/plugins/hooks/RestartFailed.py b/module/plugins/hooks/RestartFailed.py
index cab986d9e..865af2a6b 100644
--- a/module/plugins/hooks/RestartFailed.py
+++ b/module/plugins/hooks/RestartFailed.py
@@ -15,8 +15,6 @@ class RestartFailed(Hook):
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    # event_list = ["pluginConfigChanged"]
-
     MIN_CHECK_INTERVAL = 15 * 60  #: 15 minutes
 
 
@@ -37,7 +35,8 @@ class RestartFailed(Hook):
 
 
     def setup(self):
-        self.info     = {}  #@TODO: Remove in 0.4.10
+        self.info = {}  #@TODO: Remove in 0.4.10
+        # self.event_list = ["pluginConfigChanged"]
         self.interval = self.MIN_CHECK_INTERVAL
 
 
diff --git a/module/plugins/hooks/UpdateManager.py b/module/plugins/hooks/UpdateManager.py
index 5779e7c80..ceba8e792 100644
--- a/module/plugins/hooks/UpdateManager.py
+++ b/module/plugins/hooks/UpdateManager.py
@@ -49,8 +49,6 @@ class UpdateManager(Hook):
     SERVER_URL         = "http://updatemanager.pyload.org"
     MIN_CHECK_INTERVAL = 3 * 60 * 60  #: 3 hours
 
-    event_list = ["allDownloadsProcessed"]
-
 
     def coreReady(self):
         if self.checkonstart:
@@ -60,10 +58,13 @@ class UpdateManager(Hook):
 
 
     def setup(self):
-        self.interval = 10
         self.info     = {'pyload': False, 'version': None, 'plugins': False, 'last_check': time.time()}
         self.mtimes   = {}  #: store modification time for each plugin
 
+        self.event_list = ["allDownloadsProcessed"]
+
+        self.interval = 10
+
         if self.getConfig('checkonstart'):
             self.core.api.pauseServer()
             self.checkonstart = True
diff --git a/module/plugins/hooks/WindowsPhoneNotify.py b/module/plugins/hooks/WindowsPhoneNotify.py
index da960591c..8f66761f6 100644
--- a/module/plugins/hooks/WindowsPhoneNotify.py
+++ b/module/plugins/hooks/WindowsPhoneNotify.py
@@ -28,12 +28,14 @@ class WindowsPhoneNotify(Hook):
                        ("Walter Purcaro", "vuolter@gmail.com"       )]
 
 
-    event_list = ["allDownloadsProcessed", "plugin_updated"]
     interval   = 0  #@TODO: Remove in 0.4.10
 
 
     def setup(self):
-        self.info          = {}  #@TODO: Remove in 0.4.10
+        self.info = {}  #@TODO: Remove in 0.4.10
+
+        self.event_list = ["allDownloadsProcessed", "plugin_updated"]
+
         self.last_notify   = 0
         self.notifications = 0
 
diff --git a/module/plugins/hooks/XFileSharingPro.py b/module/plugins/hooks/XFileSharingPro.py
index d80515a22..7443266b3 100644
--- a/module/plugins/hooks/XFileSharingPro.py
+++ b/module/plugins/hooks/XFileSharingPro.py
@@ -22,7 +22,6 @@ class XFileSharingPro(Hook):
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    # event_list = ["pluginConfigChanged"]
     interval   = 0  #@TODO: Remove in 0.4.10
     regexp     = {'hoster' : (r'https?://(?:www\.)?(?P<DOMAIN>[\w\-.^_]{3,63}(?:\.[a-zA-Z]{2,})(?:\:\d+)?)/(?:embed-)?\w{12}(?:\W|$)',
                               r'https?://(?:[^/]+\.)?(?P<DOMAIN>%s)/(?:embed-)?\w+'),
@@ -48,6 +47,7 @@ class XFileSharingPro(Hook):
 
     def setup(self):
         self.info = {}  #@TODO: Remove in 0.4.10
+        # self.event_list = ["pluginConfigChanged"]
 
 
     def coreReady(self):
diff --git a/module/plugins/hoster/BayfilesCom.py b/module/plugins/hoster/BayfilesCom.py
index 92058d634..cccd4acc7 100644
--- a/module/plugins/hoster/BayfilesCom.py
+++ b/module/plugins/hoster/BayfilesCom.py
@@ -9,7 +9,7 @@ class BayfilesCom(DeadHoster):
     __version__ = "0.09"
 
     __pattern__ = r'https?://(?:www\.)?bayfiles\.(com|net)/file/(?P<ID>\w+/\w+/[^/]+)'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Bayfiles.com hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/BillionuploadsCom.py b/module/plugins/hoster/BillionuploadsCom.py
index efe2c22a3..d0fbd7a8b 100644
--- a/module/plugins/hoster/BillionuploadsCom.py
+++ b/module/plugins/hoster/BillionuploadsCom.py
@@ -9,6 +9,7 @@ class BillionuploadsCom(DeadHoster):
     __version__ = "0.06"
 
     __pattern__ = r'http://(?:www\.)?billionuploads\.com/\w{12}'
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Billionuploads.com hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/BoltsharingCom.py b/module/plugins/hoster/BoltsharingCom.py
index 4309eefac..db813ba2e 100644
--- a/module/plugins/hoster/BoltsharingCom.py
+++ b/module/plugins/hoster/BoltsharingCom.py
@@ -9,7 +9,7 @@ class BoltsharingCom(DeadHoster):
     __version__ = "0.02"
 
     __pattern__ = r'http://(?:www\.)?boltsharing\.com/\w{12}'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Boltsharing.com hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/CloudzerNet.py b/module/plugins/hoster/CloudzerNet.py
index d2d5e460a..af40b8d5f 100644
--- a/module/plugins/hoster/CloudzerNet.py
+++ b/module/plugins/hoster/CloudzerNet.py
@@ -9,7 +9,7 @@ class CloudzerNet(DeadHoster):
     __version__ = "0.05"
 
     __pattern__ = r'https?://(?:www\.)?(cloudzer\.net/file/|clz\.to/(file/)?)\w+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Cloudzer.net hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/CyberlockerCh.py b/module/plugins/hoster/CyberlockerCh.py
index d85a27282..9d748bf85 100644
--- a/module/plugins/hoster/CyberlockerCh.py
+++ b/module/plugins/hoster/CyberlockerCh.py
@@ -9,7 +9,7 @@ class CyberlockerCh(DeadHoster):
     __version__ = "0.02"
 
     __pattern__ = r'http://(?:www\.)?cyberlocker\.ch/\w+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Cyberlocker.ch hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/DdlstorageCom.py b/module/plugins/hoster/DdlstorageCom.py
index d67b4f30f..976d9ccf9 100644
--- a/module/plugins/hoster/DdlstorageCom.py
+++ b/module/plugins/hoster/DdlstorageCom.py
@@ -9,7 +9,7 @@ class DdlstorageCom(DeadHoster):
     __version__ = "1.02"
 
     __pattern__ = r'https?://(?:www\.)?ddlstorage\.com/\w+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """DDLStorage.com hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/DodanePl.py b/module/plugins/hoster/DodanePl.py
index 96f87a21c..46f748cc4 100644
--- a/module/plugins/hoster/DodanePl.py
+++ b/module/plugins/hoster/DodanePl.py
@@ -9,7 +9,7 @@ class DodanePl(DeadHoster):
     __version__ = "0.03"
 
     __pattern__ = r'http://(?:www\.)?dodane\.pl/file/\d+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Dodane.pl hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/DuploadOrg.py b/module/plugins/hoster/DuploadOrg.py
index 542240bab..076171544 100644
--- a/module/plugins/hoster/DuploadOrg.py
+++ b/module/plugins/hoster/DuploadOrg.py
@@ -9,7 +9,7 @@ class DuploadOrg(DeadHoster):
     __version__ = "0.02"
 
     __pattern__ = r'http://(?:www\.)?dupload\.org/\w{12}'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Dupload.grg hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/EgoFilesCom.py b/module/plugins/hoster/EgoFilesCom.py
index 46d0fac6a..78108962f 100644
--- a/module/plugins/hoster/EgoFilesCom.py
+++ b/module/plugins/hoster/EgoFilesCom.py
@@ -9,7 +9,7 @@ class EgoFilesCom(DeadHoster):
     __version__ = "0.16"
 
     __pattern__ = r'https?://(?:www\.)?egofiles\.com/\w+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Egofiles.com hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/EnteruploadCom.py b/module/plugins/hoster/EnteruploadCom.py
index b2306ce69..8ef994e1e 100644
--- a/module/plugins/hoster/EnteruploadCom.py
+++ b/module/plugins/hoster/EnteruploadCom.py
@@ -9,7 +9,7 @@ class EnteruploadCom(DeadHoster):
     __version__ = "0.02"
 
     __pattern__ = r'http://(?:www\.)?enterupload\.com/\w+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """EnterUpload.com hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/EpicShareNet.py b/module/plugins/hoster/EpicShareNet.py
index e2a44b172..7e3c8ba0e 100644
--- a/module/plugins/hoster/EpicShareNet.py
+++ b/module/plugins/hoster/EpicShareNet.py
@@ -9,7 +9,7 @@ class EpicShareNet(DeadHoster):
     __version__ = "0.02"
 
     __pattern__ = r'https?://(?:www\.)?epicshare\.net/\w{12}'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """EpicShare.net hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/FileApeCom.py b/module/plugins/hoster/FileApeCom.py
index 314f069f9..79157539b 100644
--- a/module/plugins/hoster/FileApeCom.py
+++ b/module/plugins/hoster/FileApeCom.py
@@ -9,7 +9,7 @@ class FileApeCom(DeadHoster):
     __version__ = "0.12"
 
     __pattern__ = r'http://(?:www\.)?fileape\.com/(index\.php\?act=download\&id=|dl/)\w+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """FileApe.com hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/FilebeerInfo.py b/module/plugins/hoster/FilebeerInfo.py
index 77ee367a7..244131dc7 100644
--- a/module/plugins/hoster/FilebeerInfo.py
+++ b/module/plugins/hoster/FilebeerInfo.py
@@ -9,7 +9,7 @@ class FilebeerInfo(DeadHoster):
     __version__ = "0.03"
 
     __pattern__ = r'http://(?:www\.)?filebeer\.info/(?!\d*~f)(?P<ID>\w+)'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Filebeer.info plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/FileshareInUa.py b/module/plugins/hoster/FileshareInUa.py
index c636375f5..aa1785f19 100644
--- a/module/plugins/hoster/FileshareInUa.py
+++ b/module/plugins/hoster/FileshareInUa.py
@@ -9,7 +9,7 @@ class FileshareInUa(DeadHoster):
     __version__ = "0.02"
 
     __pattern__ = r'https?://(?:www\.)?fileshare\.in\.ua/\w{7}'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Fileshare.in.ua hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/FilesonicCom.py b/module/plugins/hoster/FilesonicCom.py
index 16b4dee14..5254a6f9b 100644
--- a/module/plugins/hoster/FilesonicCom.py
+++ b/module/plugins/hoster/FilesonicCom.py
@@ -9,7 +9,7 @@ class FilesonicCom(DeadHoster):
     __version__ = "0.35"
 
     __pattern__ = r'http://(?:www\.)?filesonic\.com/file/\w+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Filesonic.com hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/FilezyNet.py b/module/plugins/hoster/FilezyNet.py
index 2a6ba2722..9f442c846 100644
--- a/module/plugins/hoster/FilezyNet.py
+++ b/module/plugins/hoster/FilezyNet.py
@@ -9,7 +9,7 @@ class FilezyNet(DeadHoster):
     __version__ = "0.20"
 
     __pattern__ = r'http://(?:www\.)?filezy\.net/\w{12}'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Filezy.net hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/FiredriveCom.py b/module/plugins/hoster/FiredriveCom.py
index 612b9ceca..8faee5b52 100644
--- a/module/plugins/hoster/FiredriveCom.py
+++ b/module/plugins/hoster/FiredriveCom.py
@@ -9,7 +9,7 @@ class FiredriveCom(DeadHoster):
     __version__ = "0.05"
 
     __pattern__ = r'https?://(?:www\.)?(firedrive|putlocker)\.com/(mobile/)?(file|embed)/(?P<ID>\w+)'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Firedrive.com hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/FreevideoCz.py b/module/plugins/hoster/FreevideoCz.py
index f47c07c7e..49f02a28b 100644
--- a/module/plugins/hoster/FreevideoCz.py
+++ b/module/plugins/hoster/FreevideoCz.py
@@ -9,7 +9,7 @@ class FreevideoCz(DeadHoster):
     __version__ = "0.30"
 
     __pattern__ = r'http://(?:www\.)?freevideo\.cz/vase-videa/.+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Freevideo.cz hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/HellspyCz.py b/module/plugins/hoster/HellspyCz.py
index 49fb9e829..9b10760bd 100644
--- a/module/plugins/hoster/HellspyCz.py
+++ b/module/plugins/hoster/HellspyCz.py
@@ -9,7 +9,7 @@ class HellspyCz(DeadHoster):
     __version__ = "0.28"
 
     __pattern__ = r'http://(?:www\.)?(?:hellspy\.(?:cz|com|sk|hu|pl)|sciagaj\.pl)(/\S+/\d+)'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """HellSpy.cz hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/HotfileCom.py b/module/plugins/hoster/HotfileCom.py
index 6c6a4fa89..082415c6b 100644
--- a/module/plugins/hoster/HotfileCom.py
+++ b/module/plugins/hoster/HotfileCom.py
@@ -9,7 +9,7 @@ class HotfileCom(DeadHoster):
     __version__ = "0.37"
 
     __pattern__ = r'https?://(?:www\.)?hotfile\.com/dl/\d+/\w+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Hotfile.com hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/IFileWs.py b/module/plugins/hoster/IFileWs.py
index 7d2a76a60..ff263d43a 100644
--- a/module/plugins/hoster/IFileWs.py
+++ b/module/plugins/hoster/IFileWs.py
@@ -9,7 +9,7 @@ class IFileWs(DeadHoster):
     __version__ = "0.02"
 
     __pattern__ = r'http://(?:www\.)?ifile\.ws/\w{12}'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Ifile.ws hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/IcyFilesCom.py b/module/plugins/hoster/IcyFilesCom.py
index ca0f6441b..f81381c66 100644
--- a/module/plugins/hoster/IcyFilesCom.py
+++ b/module/plugins/hoster/IcyFilesCom.py
@@ -9,7 +9,7 @@ class IcyFilesCom(DeadHoster):
     __version__ = "0.06"
 
     __pattern__ = r'http://(?:www\.)?icyfiles\.com/(.+)'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """IcyFiles.com hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/IfileIt.py b/module/plugins/hoster/IfileIt.py
index f13065f86..ef267b505 100644
--- a/module/plugins/hoster/IfileIt.py
+++ b/module/plugins/hoster/IfileIt.py
@@ -9,7 +9,7 @@ class IfileIt(DeadHoster):
     __version__ = "0.29"
 
     __pattern__ = r'^unmatchable$'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Ifile.it"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/KickloadCom.py b/module/plugins/hoster/KickloadCom.py
index df43b0fca..7690c85c8 100644
--- a/module/plugins/hoster/KickloadCom.py
+++ b/module/plugins/hoster/KickloadCom.py
@@ -9,7 +9,7 @@ class KickloadCom(DeadHoster):
     __version__ = "0.21"
 
     __pattern__ = r'http://(?:www\.)?kickload\.com/get/.+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Kickload.com hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/LemUploadsCom.py b/module/plugins/hoster/LemUploadsCom.py
index c7aae3bf9..098867c8b 100644
--- a/module/plugins/hoster/LemUploadsCom.py
+++ b/module/plugins/hoster/LemUploadsCom.py
@@ -9,7 +9,7 @@ class LemUploadsCom(DeadHoster):
     __version__ = "0.02"
 
     __pattern__ = r'https?://(?:www\.)?lemuploads\.com/\w{12}'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """LemUploads.com hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/LomafileCom.py b/module/plugins/hoster/LomafileCom.py
index 4dd092f45..ef05cd1ea 100644
--- a/module/plugins/hoster/LomafileCom.py
+++ b/module/plugins/hoster/LomafileCom.py
@@ -9,7 +9,7 @@ class LomafileCom(DeadHoster):
     __version__ = "0.52"
 
     __pattern__ = r'http://lomafile\.com/\w{12}'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Lomafile.com hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/MegaFilesSe.py b/module/plugins/hoster/MegaFilesSe.py
index 795b74a78..249eff952 100644
--- a/module/plugins/hoster/MegaFilesSe.py
+++ b/module/plugins/hoster/MegaFilesSe.py
@@ -9,7 +9,7 @@ class MegaFilesSe(DeadHoster):
     __version__ = "0.02"
 
     __pattern__ = r'http://(?:www\.)?megafiles\.se/\w{12}'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """MegaFiles.se hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/MegareleaseOrg.py b/module/plugins/hoster/MegareleaseOrg.py
index 1460ac868..6349144ec 100644
--- a/module/plugins/hoster/MegareleaseOrg.py
+++ b/module/plugins/hoster/MegareleaseOrg.py
@@ -9,7 +9,7 @@ class MegareleaseOrg(DeadHoster):
     __version__ = "0.02"
 
     __pattern__ = r'https?://(?:www\.)?megarelease\.org/\w{12}'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Megarelease.org hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/MegauploadCom.py b/module/plugins/hoster/MegauploadCom.py
index 7fe305834..590819f7f 100644
--- a/module/plugins/hoster/MegauploadCom.py
+++ b/module/plugins/hoster/MegauploadCom.py
@@ -9,7 +9,7 @@ class MegauploadCom(DeadHoster):
     __version__ = "0.31"
 
     __pattern__ = r'http://(?:www\.)?megaupload\.com/\?.*&?(d|v)=\w+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Megaupload.com hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/MegavideoCom.py b/module/plugins/hoster/MegavideoCom.py
index 0b4523e03..accd079fc 100644
--- a/module/plugins/hoster/MegavideoCom.py
+++ b/module/plugins/hoster/MegavideoCom.py
@@ -9,7 +9,7 @@ class MegavideoCom(DeadHoster):
     __version__ = "0.21"
 
     __pattern__ = r'http://(?:www\.)?megavideo\.com/\?.*&?(d|v)=\w+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Megavideo.com hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/NahrajCz.py b/module/plugins/hoster/NahrajCz.py
index 5f5003e22..cf708be09 100644
--- a/module/plugins/hoster/NahrajCz.py
+++ b/module/plugins/hoster/NahrajCz.py
@@ -9,7 +9,7 @@ class NahrajCz(DeadHoster):
     __version__ = "0.21"
 
     __pattern__ = r'http://(?:www\.)?nahraj\.cz/content/download/.+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Nahraj.cz hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/NetloadIn.py b/module/plugins/hoster/NetloadIn.py
index 1c56a705c..82f5c22fb 100644
--- a/module/plugins/hoster/NetloadIn.py
+++ b/module/plugins/hoster/NetloadIn.py
@@ -17,5 +17,5 @@ class NetloadIn(DeadHoster):
                        ("RaNaN", "ranan@pyload.org"),
                        ("Gregy", "gregy@gregy.cz"  )]
 
-                       
+
 getInfo = create_getInfo(NetloadIn)
diff --git a/module/plugins/hoster/OronCom.py b/module/plugins/hoster/OronCom.py
index 7002d26ab..2e4961704 100644
--- a/module/plugins/hoster/OronCom.py
+++ b/module/plugins/hoster/OronCom.py
@@ -9,7 +9,7 @@ class OronCom(DeadHoster):
     __version__ = "0.14"
 
     __pattern__ = r'https?://(?:www\.)?oron\.com/\w{12}'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Oron.com hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/PandaplaNet.py b/module/plugins/hoster/PandaplaNet.py
index a5716e4d4..ae8406d82 100644
--- a/module/plugins/hoster/PandaplaNet.py
+++ b/module/plugins/hoster/PandaplaNet.py
@@ -9,7 +9,7 @@ class PandaplaNet(DeadHoster):
     __version__ = "0.03"
 
     __pattern__ = r'http://(?:www\.)?pandapla\.net/\w{12}'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Pandapla.net hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/PotloadCom.py b/module/plugins/hoster/PotloadCom.py
index 0eed158a4..5a41f7d3c 100644
--- a/module/plugins/hoster/PotloadCom.py
+++ b/module/plugins/hoster/PotloadCom.py
@@ -9,7 +9,7 @@ class PotloadCom(DeadHoster):
     __version__ = "0.02"
 
     __pattern__ = r'http://(?:www\.)?potload\.com/\w{12}'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Potload.com hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/PrzeklejPl.py b/module/plugins/hoster/PrzeklejPl.py
index 68fd6ca6d..e984d0033 100644
--- a/module/plugins/hoster/PrzeklejPl.py
+++ b/module/plugins/hoster/PrzeklejPl.py
@@ -9,7 +9,7 @@ class PrzeklejPl(DeadHoster):
     __version__ = "0.11"
 
     __pattern__ = r'http://(?:www\.)?przeklej\.pl/plik/.+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Przeklej.pl hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/Share76Com.py b/module/plugins/hoster/Share76Com.py
index 01bbc5ac2..4a4af1672 100644
--- a/module/plugins/hoster/Share76Com.py
+++ b/module/plugins/hoster/Share76Com.py
@@ -9,7 +9,7 @@ class Share76Com(DeadHoster):
     __version__ = "0.04"
 
     __pattern__ = r'http://(?:www\.)?share76\.com/\w{12}'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Share76.com hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/ShareFilesCo.py b/module/plugins/hoster/ShareFilesCo.py
index 2fd1fc7cf..d9a71d786 100644
--- a/module/plugins/hoster/ShareFilesCo.py
+++ b/module/plugins/hoster/ShareFilesCo.py
@@ -9,7 +9,7 @@ class ShareFilesCo(DeadHoster):
     __version__ = "0.02"
 
     __pattern__ = r'http://(?:www\.)?sharefiles\.co/\w{12}'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Sharefiles.co hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/SharebeesCom.py b/module/plugins/hoster/SharebeesCom.py
index 347ae97e6..9387483cc 100644
--- a/module/plugins/hoster/SharebeesCom.py
+++ b/module/plugins/hoster/SharebeesCom.py
@@ -9,7 +9,7 @@ class SharebeesCom(DeadHoster):
     __version__ = "0.02"
 
     __pattern__ = r'http://(?:www\.)?sharebees\.com/\w{12}'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """ShareBees hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/SharingmatrixCom.py b/module/plugins/hoster/SharingmatrixCom.py
index 925c6af8d..3958ebbd6 100644
--- a/module/plugins/hoster/SharingmatrixCom.py
+++ b/module/plugins/hoster/SharingmatrixCom.py
@@ -9,7 +9,7 @@ class SharingmatrixCom(DeadHoster):
     __version__ = "0.01"
 
     __pattern__ = r'http://(?:www\.)?sharingmatrix\.com/file/\w+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Sharingmatrix.com hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/ShragleCom.py b/module/plugins/hoster/ShragleCom.py
index 9a4a259d8..689223322 100644
--- a/module/plugins/hoster/ShragleCom.py
+++ b/module/plugins/hoster/ShragleCom.py
@@ -9,7 +9,7 @@ class ShragleCom(DeadHoster):
     __version__ = "0.22"
 
     __pattern__ = r'http://(?:www\.)?(cloudnator|shragle)\.com/files/(?P<ID>.+?)/'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Cloudnator.com (Shragle.com) hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/SockshareCom.py b/module/plugins/hoster/SockshareCom.py
index 574c66d5b..44eedf9d4 100644
--- a/module/plugins/hoster/SockshareCom.py
+++ b/module/plugins/hoster/SockshareCom.py
@@ -9,7 +9,7 @@ class SockshareCom(DeadHoster):
     __version__ = "0.05"
 
     __pattern__ = r'http://(?:www\.)?sockshare\.com/(mobile/)?(file|embed)/(?P<ID>\w+)'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Sockshare.com hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/SpeedLoadOrg.py b/module/plugins/hoster/SpeedLoadOrg.py
index 08a87e455..18f04b611 100644
--- a/module/plugins/hoster/SpeedLoadOrg.py
+++ b/module/plugins/hoster/SpeedLoadOrg.py
@@ -9,7 +9,7 @@ class SpeedLoadOrg(DeadHoster):
     __version__ = "1.02"
 
     __pattern__ = r'http://(?:www\.)?speedload\.org/(?P<ID>\w+)'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Speedload.org hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/SpeedfileCz.py b/module/plugins/hoster/SpeedfileCz.py
index d3d627505..cd6d65082 100644
--- a/module/plugins/hoster/SpeedfileCz.py
+++ b/module/plugins/hoster/SpeedfileCz.py
@@ -9,7 +9,7 @@ class SpeedfileCz(DeadHoster):
     __version__ = "0.32"
 
     __pattern__ = r'http://(?:www\.)?speedfile\.cz/.+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Speedfile.cz hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/StorageTo.py b/module/plugins/hoster/StorageTo.py
index f9bba7822..feb9f3300 100644
--- a/module/plugins/hoster/StorageTo.py
+++ b/module/plugins/hoster/StorageTo.py
@@ -9,7 +9,7 @@ class StorageTo(DeadHoster):
     __version__ = "0.01"
 
     __pattern__ = r'http://(?:www\.)?storage\.to/get/.+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Storage.to hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/TurbouploadCom.py b/module/plugins/hoster/TurbouploadCom.py
index 4b4d0c2e3..e4b53b818 100644
--- a/module/plugins/hoster/TurbouploadCom.py
+++ b/module/plugins/hoster/TurbouploadCom.py
@@ -9,7 +9,7 @@ class TurbouploadCom(DeadHoster):
     __version__ = "0.03"
 
     __pattern__ = r'http://(?:www\.)?turboupload\.com/(\w+)'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Turboupload.com hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/UnrestrictLi.py b/module/plugins/hoster/UnrestrictLi.py
index d3854db31..b63796fe0 100644
--- a/module/plugins/hoster/UnrestrictLi.py
+++ b/module/plugins/hoster/UnrestrictLi.py
@@ -9,6 +9,7 @@ class UnrestrictLi(DeadHoster):
     __version__ = "0.23"
 
     __pattern__ = r'https?://(?:www\.)?(unrestrict|unr)\.li/dl/[\w^_]+'
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Unrestrict.li multi-hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/UploadStationCom.py b/module/plugins/hoster/UploadStationCom.py
index 90c177d71..61226e3da 100644
--- a/module/plugins/hoster/UploadStationCom.py
+++ b/module/plugins/hoster/UploadStationCom.py
@@ -9,7 +9,7 @@ class UploadStationCom(DeadHoster):
     __version__ = "0.52"
 
     __pattern__ = r'http://(?:www\.)?uploadstation\.com/file/(?P<ID>\w+)'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """UploadStation.com hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/UploadboxCom.py b/module/plugins/hoster/UploadboxCom.py
index 5a3856c6b..cb4f50184 100644
--- a/module/plugins/hoster/UploadboxCom.py
+++ b/module/plugins/hoster/UploadboxCom.py
@@ -9,7 +9,7 @@ class UploadboxCom(DeadHoster):
     __version__ = "0.05"
 
     __pattern__ = r'http://(?:www\.)?uploadbox\.com/files/.+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """UploadBox.com hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/UploadhereCom.py b/module/plugins/hoster/UploadhereCom.py
index d3b095c15..bc94e644e 100644
--- a/module/plugins/hoster/UploadhereCom.py
+++ b/module/plugins/hoster/UploadhereCom.py
@@ -9,7 +9,7 @@ class UploadhereCom(DeadHoster):
     __version__ = "0.12"
 
     __pattern__ = r'http://(?:www\.)?uploadhere\.com/\w{10}'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Uploadhere.com hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/UploadkingCom.py b/module/plugins/hoster/UploadkingCom.py
index 6c24fe51a..0d60cef1f 100644
--- a/module/plugins/hoster/UploadkingCom.py
+++ b/module/plugins/hoster/UploadkingCom.py
@@ -9,7 +9,7 @@ class UploadkingCom(DeadHoster):
     __version__ = "0.14"
 
     __pattern__ = r'http://(?:www\.)?uploadking\.com/\w{10}'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """UploadKing.com hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/Vipleech4UCom.py b/module/plugins/hoster/Vipleech4UCom.py
index 1a7ec2810..5668e0fad 100644
--- a/module/plugins/hoster/Vipleech4UCom.py
+++ b/module/plugins/hoster/Vipleech4UCom.py
@@ -9,7 +9,7 @@ class Vipleech4UCom(DeadHoster):
     __version__ = "0.20"
 
     __pattern__ = r'http://(?:www\.)?vipleech4u\.com/manager\.php'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Vipleech4u.com hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/WarserverCz.py b/module/plugins/hoster/WarserverCz.py
index a8ae99a1b..6cb94e57e 100644
--- a/module/plugins/hoster/WarserverCz.py
+++ b/module/plugins/hoster/WarserverCz.py
@@ -9,7 +9,7 @@ class WarserverCz(DeadHoster):
     __version__ = "0.13"
 
     __pattern__ = r'http://(?:www\.)?warserver\.cz/stahnout/\d+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Warserver.cz hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/WuploadCom.py b/module/plugins/hoster/WuploadCom.py
index 14c56aba3..73c008ae8 100644
--- a/module/plugins/hoster/WuploadCom.py
+++ b/module/plugins/hoster/WuploadCom.py
@@ -9,7 +9,7 @@ class WuploadCom(DeadHoster):
     __version__ = "0.23"
 
     __pattern__ = r'http://(?:www\.)?wupload\..+?/file/((\w+/)?\d+)(/.*)?'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Wupload.com hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/X7To.py b/module/plugins/hoster/X7To.py
index 15e011720..8e2dd3a53 100644
--- a/module/plugins/hoster/X7To.py
+++ b/module/plugins/hoster/X7To.py
@@ -9,7 +9,7 @@ class X7To(DeadHoster):
     __version__ = "0.41"
 
     __pattern__ = r'http://(?:www\.)?x7\.to/'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """X7.to hoster plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/hoster/ZShareNet.py b/module/plugins/hoster/ZShareNet.py
index 8142136bb..6e4508a18 100644
--- a/module/plugins/hoster/ZShareNet.py
+++ b/module/plugins/hoster/ZShareNet.py
@@ -9,7 +9,7 @@ class ZShareNet(DeadHoster):
     __version__ = "0.21"
 
     __pattern__ = r'https?://(?:ww[2w]\.)?zshares?\.net/.+'
-    __config__  = []
+    __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """ZShare.net hoster plugin"""
     __license__     = "GPLv3"