Partially revert acc46fc3497a66a427b795b4a22c6e71d69185a1

84 files changed, 505 insertions, 505 deletions

diff --git a/pyload/plugin/account/AlldebridCom.py b/pyload/plugin/account/AlldebridCom.py
index 14b1755ca..f9906bd9d 100644
--- a/pyload/plugin/account/AlldebridCom.py
+++ b/pyload/plugin/account/AlldebridCom.py
@@ -12,13 +12,13 @@ from pyload.plugin.Account import Account
 
 
 class AlldebridCom(Account):
-    __name    = "AlldebridCom"
-    __type    = "account"
-    __version = "0.22"
+    __name__    = "AlldebridCom"
+    __type__    = "account"
+    __version__ = "0.22"
 
-    __description = """AllDebrid.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("Andy Voigt", "spamsales@online.de")]
+    __description__ = """AllDebrid.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Andy Voigt", "spamsales@online.de")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/BayfilesCom.py b/pyload/plugin/account/BayfilesCom.py
index 5ca04c86b..760c29d4e 100644
--- a/pyload/plugin/account/BayfilesCom.py
+++ b/pyload/plugin/account/BayfilesCom.py
@@ -7,13 +7,13 @@ from pyload.utils import json_loads
 
 
 class BayfilesCom(Account):
-    __name    = "BayfilesCom"
-    __type    = "account"
-    __version = "0.03"
+    __name__    = "BayfilesCom"
+    __type__    = "account"
+    __version__ = "0.03"
 
-    __description = """Bayfiles.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """Bayfiles.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/BillionuploadsCom.py b/pyload/plugin/account/BillionuploadsCom.py
index 982a2cc34..a3325c427 100644
--- a/pyload/plugin/account/BillionuploadsCom.py
+++ b/pyload/plugin/account/BillionuploadsCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class BillionuploadsCom(XFSAccount):
-    __name    = "BillionuploadsCom"
-    __type    = "account"
-    __version = "0.02"
+    __name__    = "BillionuploadsCom"
+    __type__    = "account"
+    __version__ = "0.02"
 
-    __description = """Billionuploads.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description__ = """Billionuploads.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = "billionuploads.com"
diff --git a/pyload/plugin/account/BitshareCom.py b/pyload/plugin/account/BitshareCom.py
index 591fe7f89..aabab9e19 100644
--- a/pyload/plugin/account/BitshareCom.py
+++ b/pyload/plugin/account/BitshareCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.Account import Account
 
 
 class BitshareCom(Account):
-    __name    = "BitshareCom"
-    __type    = "account"
-    __version = "0.12"
+    __name__    = "BitshareCom"
+    __type__    = "account"
+    __version__ = "0.12"
 
-    __description = """Bitshare account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("Paul King", "")]
+    __description__ = """Bitshare account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Paul King", "")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/CatShareNet.py b/pyload/plugin/account/CatShareNet.py
index 8fe3d05cf..4c1cd00d7 100644
--- a/pyload/plugin/account/CatShareNet.py
+++ b/pyload/plugin/account/CatShareNet.py
@@ -8,13 +8,13 @@ from pyload.plugin.Account import Account
 
 
 class CatShareNet(Account):
-    __name    = "CatShareNet"
-    __type    = "account"
-    __version = "0.01"
+    __name__    = "CatShareNet"
+    __type__    = "account"
+    __version__ = "0.01"
 
-    __description = """CatShareNet account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("prOq", "")]
+    __description__ = """CatShareNet account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("prOq", "")]
 
 
     PREMIUM_PATTERN = r'class="nav-collapse collapse pull-right">[\s\w<>=-."/:]*\sz.</a></li>\s*<li><a href="/premium">.*\s*<span style="color: red">(.*?)</span>[\s\w<>/]*href="/logout"'
diff --git a/pyload/plugin/account/CramitIn.py b/pyload/plugin/account/CramitIn.py
index ccd291776..21503f625 100644
--- a/pyload/plugin/account/CramitIn.py
+++ b/pyload/plugin/account/CramitIn.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class CramitIn(XFSAccount):
-    __name    = "CramitIn"
-    __type    = "account"
-    __version = "0.03"
+    __name__    = "CramitIn"
+    __type__    = "account"
+    __version__ = "0.03"
 
-    __description = """Cramit.in account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """Cramit.in account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     HOSTER_DOMAIN = "cramit.in"
diff --git a/pyload/plugin/account/CzshareCom.py b/pyload/plugin/account/CzshareCom.py
index f11d4efd4..6608efd90 100644
--- a/pyload/plugin/account/CzshareCom.py
+++ b/pyload/plugin/account/CzshareCom.py
@@ -7,13 +7,13 @@ from pyload.plugin.Account import Account
 
 
 class CzshareCom(Account):
-    __name    = "CzshareCom"
-    __type    = "account"
-    __version = "0.14"
+    __name__    = "CzshareCom"
+    __type__    = "account"
+    __version__ = "0.14"
 
-    __description = """Czshare.com account plugin, now Sdilej.cz"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),
+    __description__ = """Czshare.com account plugin, now Sdilej.cz"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/pyload/plugin/account/DebridItaliaCom.py b/pyload/plugin/account/DebridItaliaCom.py
index c895842f0..c8990f882 100644
--- a/pyload/plugin/account/DebridItaliaCom.py
+++ b/pyload/plugin/account/DebridItaliaCom.py
@@ -8,13 +8,13 @@ from pyload.plugin.Account import Account
 
 
 class DebridItaliaCom(Account):
-    __name    = "DebridItaliaCom"
-    __type    = "account"
-    __version = "0.11"
+    __name__    = "DebridItaliaCom"
+    __type__    = "account"
+    __version__ = "0.11"
 
-    __description = """Debriditalia.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("stickell", "l.stickell@yahoo.it"),
+    __description__ = """Debriditalia.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("stickell", "l.stickell@yahoo.it"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/pyload/plugin/account/DepositfilesCom.py b/pyload/plugin/account/DepositfilesCom.py
index ac1da7b0c..bce33777b 100644
--- a/pyload/plugin/account/DepositfilesCom.py
+++ b/pyload/plugin/account/DepositfilesCom.py
@@ -8,13 +8,13 @@ from pyload.plugin.Account import Account
 
 
 class DepositfilesCom(Account):
-    __name    = "DepositfilesCom"
-    __type    = "account"
-    __version = "0.30"
+    __name__    = "DepositfilesCom"
+    __type__    = "account"
+    __version__ = "0.30"
 
-    __description = """Depositfiles.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("mkaay", "mkaay@mkaay.de"),
+    __description__ = """Depositfiles.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("mkaay", "mkaay@mkaay.de"),
                        ("stickell", "l.stickell@yahoo.it"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
diff --git a/pyload/plugin/account/DropboxCom.py b/pyload/plugin/account/DropboxCom.py
index 2c4c36c4a..341bb761d 100644
--- a/pyload/plugin/account/DropboxCom.py
+++ b/pyload/plugin/account/DropboxCom.py
@@ -6,15 +6,15 @@ from pyload.plugin.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
 class DropboxCom(SimpleHoster):
-    __name    = "DropboxCom"
-    __type    = "hoster"
-    __version = "0.03"
+    __name__    = "DropboxCom"
+    __type__    = "hoster"
+    __version__ = "0.03"
 
-    __pattern = r'https?://(?:www\.)?dropbox\.com/.+'
+    __pattern__ = r'https?://(?:www\.)?dropbox\.com/.+'
 
-    __description = """Dropbox.com hoster plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de")]
+    __description__ = """Dropbox.com hoster plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")]
 
 
     NAME_PATTERN = r'<title>Dropbox - (?P<N>.+?)<'
diff --git a/pyload/plugin/account/EasybytezCom.py b/pyload/plugin/account/EasybytezCom.py
index c1f641669..c7d717474 100644
--- a/pyload/plugin/account/EasybytezCom.py
+++ b/pyload/plugin/account/EasybytezCom.py
@@ -6,13 +6,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class EasybytezCom(XFSAccount):
-    __name    = "EasybytezCom"
-    __type    = "account"
-    __version = "0.12"
+    __name__    = "EasybytezCom"
+    __type__    = "account"
+    __version__ = "0.12"
 
-    __description = """EasyBytez.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),
+    __description__ = """EasyBytez.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
                        ("guidobelix", "guidobelix@hotmail.it")]
 
 
diff --git a/pyload/plugin/account/EuroshareEu.py b/pyload/plugin/account/EuroshareEu.py
index 9e948816c..2d9288ba8 100644
--- a/pyload/plugin/account/EuroshareEu.py
+++ b/pyload/plugin/account/EuroshareEu.py
@@ -7,13 +7,13 @@ from pyload.plugin.Account import Account
 
 
 class EuroshareEu(Account):
-    __name    = "EuroshareEu"
-    __type    = "account"
-    __version = "0.01"
+    __name__    = "EuroshareEu"
+    __type__    = "account"
+    __version__ = "0.01"
 
-    __description = """Euroshare.eu account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """Euroshare.eu account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/FastixRu.py b/pyload/plugin/account/FastixRu.py
index b2ef7f685..0f2ac71ce 100644
--- a/pyload/plugin/account/FastixRu.py
+++ b/pyload/plugin/account/FastixRu.py
@@ -5,13 +5,13 @@ from pyload.utils import json_loads
 
 
 class FastixRu(Account):
-    __name    = "FastixRu"
-    __type    = "account"
-    __version = "0.02"
+    __name__    = "FastixRu"
+    __type__    = "account"
+    __version__ = "0.02"
 
-    __description = """Fastix account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("Massimo Rosamilia", "max@spiritix.eu")]
+    __description__ = """Fastix account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Massimo Rosamilia", "max@spiritix.eu")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/FastshareCz.py b/pyload/plugin/account/FastshareCz.py
index 4ce94be5e..8fe98438b 100644
--- a/pyload/plugin/account/FastshareCz.py
+++ b/pyload/plugin/account/FastshareCz.py
@@ -7,13 +7,13 @@ from pyload.utils import parseFileSize
 
 
 class FastshareCz(Account):
-    __name    = "FastshareCz"
-    __type    = "account"
-    __version = "0.05"
+    __name__    = "FastshareCz"
+    __type__    = "account"
+    __version__ = "0.05"
 
-    __description = """Fastshare.cz account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),
+    __description__ = """Fastshare.cz account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/pyload/plugin/account/File4safeCom.py b/pyload/plugin/account/File4safeCom.py
index d7004b463..4f311aa4c 100644
--- a/pyload/plugin/account/File4safeCom.py
+++ b/pyload/plugin/account/File4safeCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class File4safeCom(XFSAccount):
-    __name    = "File4safeCom"
-    __type    = "account"
-    __version = "0.04"
+    __name__    = "File4safeCom"
+    __type__    = "account"
+    __version__ = "0.04"
 
-    __description = """File4safe.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("stickell", "l.stickell@yahoo.it")]
+    __description__ = """File4safe.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
     HOSTER_DOMAIN = "file4safe.com"
diff --git a/pyload/plugin/account/FileParadoxIn.py b/pyload/plugin/account/FileParadoxIn.py
index 0e103c4e7..02b923519 100644
--- a/pyload/plugin/account/FileParadoxIn.py
+++ b/pyload/plugin/account/FileParadoxIn.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class FileParadoxIn(XFSAccount):
-    __name    = "FileParadoxIn"
-    __type    = "account"
-    __version = "0.02"
+    __name__    = "FileParadoxIn"
+    __type__    = "account"
+    __version__ = "0.02"
 
-    __description = """FileParadox.in account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description__ = """FileParadox.in account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = "fileparadox.in"
diff --git a/pyload/plugin/account/FilecloudIo.py b/pyload/plugin/account/FilecloudIo.py
index c6638bb1f..8169bfdce 100644
--- a/pyload/plugin/account/FilecloudIo.py
+++ b/pyload/plugin/account/FilecloudIo.py
@@ -5,13 +5,13 @@ from pyload.utils import json_loads
 
 
 class FilecloudIo(Account):
-    __name    = "FilecloudIo"
-    __type    = "account"
-    __version = "0.02"
+    __name__    = "FilecloudIo"
+    __type__    = "account"
+    __version__ = "0.02"
 
-    __description = """FilecloudIo account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),
+    __description__ = """FilecloudIo account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/pyload/plugin/account/FilefactoryCom.py b/pyload/plugin/account/FilefactoryCom.py
index d79875423..6b7399db6 100644
--- a/pyload/plugin/account/FilefactoryCom.py
+++ b/pyload/plugin/account/FilefactoryCom.py
@@ -9,13 +9,13 @@ from pyload.plugin.Account import Account
 
 
 class FilefactoryCom(Account):
-    __name    = "FilefactoryCom"
-    __type    = "account"
-    __version = "0.14"
+    __name__    = "FilefactoryCom"
+    __type__    = "account"
+    __version__ = "0.14"
 
-    __description = """Filefactory.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),
+    __description__ = """Filefactory.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/pyload/plugin/account/FilejungleCom.py b/pyload/plugin/account/FilejungleCom.py
index 5de4a244d..5734f1638 100644
--- a/pyload/plugin/account/FilejungleCom.py
+++ b/pyload/plugin/account/FilejungleCom.py
@@ -7,13 +7,13 @@ from pyload.plugin.Account import Account
 
 
 class FilejungleCom(Account):
-    __name    = "FilejungleCom"
-    __type    = "account"
-    __version = "0.11"
+    __name__    = "FilejungleCom"
+    __type__    = "account"
+    __version__ = "0.11"
 
-    __description = """Filejungle.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """Filejungle.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     login_timeout = 60
diff --git a/pyload/plugin/account/FileomCom.py b/pyload/plugin/account/FileomCom.py
index 2868e49e6..36a11e411 100644
--- a/pyload/plugin/account/FileomCom.py
+++ b/pyload/plugin/account/FileomCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class FileomCom(XFSAccount):
-    __name    = "FileomCom"
-    __type    = "account"
-    __version = "0.02"
+    __name__    = "FileomCom"
+    __type__    = "account"
+    __version__ = "0.02"
 
-    __description = """Fileom.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description__ = """Fileom.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = "fileom.com"
diff --git a/pyload/plugin/account/FilerNet.py b/pyload/plugin/account/FilerNet.py
index 9420a6e8e..679a9dc40 100644
--- a/pyload/plugin/account/FilerNet.py
+++ b/pyload/plugin/account/FilerNet.py
@@ -7,13 +7,13 @@ from pyload.plugin.Account import Account
 
 
 class FilerNet(Account):
-    __name    = "FilerNet"
-    __type    = "account"
-    __version = "0.02"
+    __name__    = "FilerNet"
+    __type__    = "account"
+    __version__ = "0.02"
 
-    __description = """Filer.net account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("stickell", "l.stickell@yahoo.it")]
+    __description__ = """Filer.net account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
     TOKEN_PATTERN = r'_csrf_token" value="([^"]+)" />'
diff --git a/pyload/plugin/account/FilerioCom.py b/pyload/plugin/account/FilerioCom.py
index d222fa78b..1d9f8744b 100644
--- a/pyload/plugin/account/FilerioCom.py
+++ b/pyload/plugin/account/FilerioCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class FilerioCom(XFSAccount):
-    __name    = "FilerioCom"
-    __type    = "account"
-    __version = "0.03"
+    __name__    = "FilerioCom"
+    __type__    = "account"
+    __version__ = "0.03"
 
-    __description = """FileRio.in account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """FileRio.in account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     HOSTER_DOMAIN = "filerio.in"
diff --git a/pyload/plugin/account/FilesMailRu.py b/pyload/plugin/account/FilesMailRu.py
index 41433687f..bbff7311c 100644
--- a/pyload/plugin/account/FilesMailRu.py
+++ b/pyload/plugin/account/FilesMailRu.py
@@ -4,13 +4,13 @@ from pyload.plugin.Account import Account
 
 
 class FilesMailRu(Account):
-    __name    = "FilesMailRu"
-    __type    = "account"
-    __version = "0.10"
+    __name__    = "FilesMailRu"
+    __type__    = "account"
+    __version__ = "0.10"
 
-    __description = """Filesmail.ru account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("RaNaN", "RaNaN@pyload.org")]
+    __description__ = """Filesmail.ru account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("RaNaN", "RaNaN@pyload.org")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/FileserveCom.py b/pyload/plugin/account/FileserveCom.py
index d0ef0cd62..7557450be 100644
--- a/pyload/plugin/account/FileserveCom.py
+++ b/pyload/plugin/account/FileserveCom.py
@@ -7,13 +7,13 @@ from pyload.utils import json_loads
 
 
 class FileserveCom(Account):
-    __name    = "FileserveCom"
-    __type    = "account"
-    __version = "0.20"
+    __name__    = "FileserveCom"
+    __type__    = "account"
+    __version__ = "0.20"
 
-    __description = """Fileserve.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("mkaay", "mkaay@mkaay.de")]
+    __description__ = """Fileserve.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("mkaay", "mkaay@mkaay.de")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/FourSharedCom.py b/pyload/plugin/account/FourSharedCom.py
index 84c062e84..3ef865a91 100644
--- a/pyload/plugin/account/FourSharedCom.py
+++ b/pyload/plugin/account/FourSharedCom.py
@@ -5,13 +5,13 @@ from pyload.utils import json_loads
 
 
 class FourSharedCom(Account):
-    __name    = "FourSharedCom"
-    __type    = "account"
-    __version = "0.03"
+    __name__    = "FourSharedCom"
+    __type__    = "account"
+    __version__ = "0.03"
 
-    __description = """FourShared.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),
+    __description__ = """FourShared.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/pyload/plugin/account/FreakshareCom.py b/pyload/plugin/account/FreakshareCom.py
index 76d094a8b..9905e3f55 100644
--- a/pyload/plugin/account/FreakshareCom.py
+++ b/pyload/plugin/account/FreakshareCom.py
@@ -8,13 +8,13 @@ from pyload.plugin.Account import Account
 
 
 class FreakshareCom(Account):
-    __name    = "FreakshareCom"
-    __type    = "account"
-    __version = "0.11"
+    __name__    = "FreakshareCom"
+    __type__    = "account"
+    __version__ = "0.11"
 
-    __description = """Freakshare.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("RaNaN", "RaNaN@pyload.org")]
+    __description__ = """Freakshare.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("RaNaN", "RaNaN@pyload.org")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/FreeWayMe.py b/pyload/plugin/account/FreeWayMe.py
index 90c504c70..7b57cc6a0 100644
--- a/pyload/plugin/account/FreeWayMe.py
+++ b/pyload/plugin/account/FreeWayMe.py
@@ -5,13 +5,13 @@ from pyload.utils import json_loads
 
 
 class FreeWayMe(Account):
-    __name    = "FreeWayMe"
-    __type    = "account"
-    __version = "0.11"
+    __name__    = "FreeWayMe"
+    __type__    = "account"
+    __version__ = "0.11"
 
-    __description = """FreeWayMe account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("Nicolas Giese", "james@free-way.me")]
+    __description__ = """FreeWayMe account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Nicolas Giese", "james@free-way.me")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/FshareVn.py b/pyload/plugin/account/FshareVn.py
index 130892490..c84ce6648 100644
--- a/pyload/plugin/account/FshareVn.py
+++ b/pyload/plugin/account/FshareVn.py
@@ -8,13 +8,13 @@ from pyload.plugin.Account import Account
 
 
 class FshareVn(Account):
-    __name    = "FshareVn"
-    __type    = "account"
-    __version = "0.07"
+    __name__    = "FshareVn"
+    __type__    = "account"
+    __version__ = "0.07"
 
-    __description = """Fshare.vn account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),
+    __description__ = """Fshare.vn account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/pyload/plugin/account/Ftp.py b/pyload/plugin/account/Ftp.py
index c7983b0c2..67cde2cdd 100644
--- a/pyload/plugin/account/Ftp.py
+++ b/pyload/plugin/account/Ftp.py
@@ -4,13 +4,13 @@ from pyload.plugin.Account import Account
 
 
 class Ftp(Account):
-    __name    = "Ftp"
-    __type    = "account"
-    __version = "0.01"
+    __name__    = "Ftp"
+    __type__    = "account"
+    __version__ = "0.01"
 
-    __description = """Ftp dummy account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """Ftp dummy account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     login_timeout  = -1  #: Unlimited
diff --git a/pyload/plugin/account/HellshareCz.py b/pyload/plugin/account/HellshareCz.py
index 08d45bdda..6f160fa11 100644
--- a/pyload/plugin/account/HellshareCz.py
+++ b/pyload/plugin/account/HellshareCz.py
@@ -7,13 +7,13 @@ from pyload.plugin.Account import Account
 
 
 class HellshareCz(Account):
-    __name    = "HellshareCz"
-    __type    = "account"
-    __version = "0.14"
+    __name__    = "HellshareCz"
+    __type__    = "account"
+    __version__ = "0.14"
 
-    __description = """Hellshare.cz account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """Hellshare.cz account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     CREDIT_LEFT_PATTERN = r'<div class="credit-link">\s*<table>\s*<tr>\s*<th>(\d+|\d\d\.\d\d\.)</th>'
diff --git a/pyload/plugin/account/Http.py b/pyload/plugin/account/Http.py
index aacdbf89f..2571ef712 100644
--- a/pyload/plugin/account/Http.py
+++ b/pyload/plugin/account/Http.py
@@ -4,13 +4,13 @@ from pyload.plugin.Account import Account
 
 
 class Http(Account):
-    __name    = "Http"
-    __type    = "account"
-    __version = "0.01"
+    __name__    = "Http"
+    __type__    = "account"
+    __version__ = "0.01"
 
-    __description = """Http dummy account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """Http dummy account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     login_timeout  = -1  #: Unlimited
diff --git a/pyload/plugin/account/HugefilesNet.py b/pyload/plugin/account/HugefilesNet.py
index b4cd6f8c4..eb383fb17 100644
--- a/pyload/plugin/account/HugefilesNet.py
+++ b/pyload/plugin/account/HugefilesNet.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class HugefilesNet(XFSAccount):
-    __name    = "HugefilesNet"
-    __type    = "account"
-    __version = "0.02"
+    __name__    = "HugefilesNet"
+    __type__    = "account"
+    __version__ = "0.02"
 
-    __description = """Hugefiles.net account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description__ = """Hugefiles.net account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = "hugefiles.net"
diff --git a/pyload/plugin/account/HundredEightyUploadCom.py b/pyload/plugin/account/HundredEightyUploadCom.py
index 79af089ca..79b5ee033 100644
--- a/pyload/plugin/account/HundredEightyUploadCom.py
+++ b/pyload/plugin/account/HundredEightyUploadCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class HundredEightyUploadCom(XFSAccount):
-    __name    = "HundredEightyUploadCom"
-    __type    = "account"
-    __version = "0.02"
+    __name__    = "HundredEightyUploadCom"
+    __type__    = "account"
+    __version__ = "0.02"
 
-    __description = """180upload.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description__ = """180upload.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = "180upload.com"
diff --git a/pyload/plugin/account/JunocloudMe.py b/pyload/plugin/account/JunocloudMe.py
index 75307c6dd..0ffa92eb6 100644
--- a/pyload/plugin/account/JunocloudMe.py
+++ b/pyload/plugin/account/JunocloudMe.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class JunocloudMe(XFSAccount):
-    __name    = "JunocloudMe"
-    __type    = "account"
-    __version = "0.02"
+    __name__    = "JunocloudMe"
+    __type__    = "account"
+    __version__ = "0.02"
 
-    __description = """Junocloud.me account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("guidobelix", "guidobelix@hotmail.it")]
+    __description__ = """Junocloud.me account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("guidobelix", "guidobelix@hotmail.it")]
 
 
     HOSTER_DOMAIN = "junocloud.me"
diff --git a/pyload/plugin/account/Keep2shareCc.py b/pyload/plugin/account/Keep2shareCc.py
index 1086d893f..7ed15dc62 100644
--- a/pyload/plugin/account/Keep2shareCc.py
+++ b/pyload/plugin/account/Keep2shareCc.py
@@ -8,13 +8,13 @@ from pyload.plugin.Account import Account
 
 
 class Keep2shareCc(Account):
-    __name    = "Keep2shareCc"
-    __type    = "account"
-    __version = "0.02"
+    __name__    = "Keep2shareCc"
+    __type__    = "account"
+    __version__ = "0.02"
 
-    __description = """Keep2share.cc account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("aeronaut", "aeronaut@pianoguy.de")]
+    __description__ = """Keep2share.cc account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("aeronaut", "aeronaut@pianoguy.de")]
 
 
     VALID_UNTIL_PATTERN  = r'Premium expires: <b>(.+?)</b>'
diff --git a/pyload/plugin/account/LetitbitNet.py b/pyload/plugin/account/LetitbitNet.py
index b014268ae..c7615dd56 100644
--- a/pyload/plugin/account/LetitbitNet.py
+++ b/pyload/plugin/account/LetitbitNet.py
@@ -5,13 +5,13 @@ from pyload.plugin.Account import Account
 
 
 class LetitbitNet(Account):
-    __name    = "LetitbitNet"
-    __type    = "account"
-    __version = "0.01"
+    __name__    = "LetitbitNet"
+    __type__    = "account"
+    __version__ = "0.01"
 
-    __description = """Letitbit.net account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("stickell", "l.stickell@yahoo.it")]
+    __description__ = """Letitbit.net account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/LinestorageCom.py b/pyload/plugin/account/LinestorageCom.py
index 353c1e811..6a9991b17 100644
--- a/pyload/plugin/account/LinestorageCom.py
+++ b/pyload/plugin/account/LinestorageCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class LinestorageCom(XFSAccount):
-    __name    = "LinestorageCom"
-    __type    = "account"
-    __version = "0.02"
+    __name__    = "LinestorageCom"
+    __type__    = "account"
+    __version__ = "0.02"
 
-    __description = """Linestorage.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description__ = """Linestorage.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = "linestorage.com"
diff --git a/pyload/plugin/account/LinksnappyCom.py b/pyload/plugin/account/LinksnappyCom.py
index a510a59ea..968271dd7 100644
--- a/pyload/plugin/account/LinksnappyCom.py
+++ b/pyload/plugin/account/LinksnappyCom.py
@@ -7,13 +7,13 @@ from pyload.utils import json_loads
 
 
 class LinksnappyCom(Account):
-    __name    = "LinksnappyCom"
-    __type    = "account"
-    __version = "0.02"
+    __name__    = "LinksnappyCom"
+    __type__    = "account"
+    __version__ = "0.02"
 
-    __description = """Linksnappy.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("stickell", "l.stickell@yahoo.it")]
+    __description__ = """Linksnappy.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/LomafileCom.py b/pyload/plugin/account/LomafileCom.py
index c55c9538d..24f988ac1 100644
--- a/pyload/plugin/account/LomafileCom.py
+++ b/pyload/plugin/account/LomafileCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class LomafileCom(XFSAccount):
-    __name    = "LomafileCom"
-    __type    = "account"
-    __version = "0.02"
+    __name__    = "LomafileCom"
+    __type__    = "account"
+    __version__ = "0.02"
 
-    __description = """Lomafile.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("guidobelix", "guidobelix@hotmail.it")]
+    __description__ = """Lomafile.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("guidobelix", "guidobelix@hotmail.it")]
 
 
     HOSTER_DOMAIN = "lomafile.com"
diff --git a/pyload/plugin/account/MegaDebridEu.py b/pyload/plugin/account/MegaDebridEu.py
index 67af94541..c2e64bcc7 100644
--- a/pyload/plugin/account/MegaDebridEu.py
+++ b/pyload/plugin/account/MegaDebridEu.py
@@ -5,13 +5,13 @@ from pyload.utils import json_loads
 
 
 class MegaDebridEu(Account):
-    __name    = "MegaDebridEu"
-    __type    = "account"
-    __version = "0.20"
+    __name__    = "MegaDebridEu"
+    __type__    = "account"
+    __version__ = "0.20"
 
-    __description = """mega-debrid.eu account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("D.Ducatel", "dducatel@je-geek.fr")]
+    __description__ = """mega-debrid.eu account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("D.Ducatel", "dducatel@je-geek.fr")]
 
 
     # Define the base URL of MegaDebrid api
diff --git a/pyload/plugin/account/MegaRapidCz.py b/pyload/plugin/account/MegaRapidCz.py
index 9e9f5cb02..5ceee1301 100644
--- a/pyload/plugin/account/MegaRapidCz.py
+++ b/pyload/plugin/account/MegaRapidCz.py
@@ -7,13 +7,13 @@ from pyload.plugin.Account import Account
 
 
 class MegaRapidCz(Account):
-    __name    = "MegaRapidCz"
-    __type    = "account"
-    __version = "0.34"
+    __name__    = "MegaRapidCz"
+    __type__    = "account"
+    __version__ = "0.34"
 
-    __description = """MegaRapid.cz account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("MikyWoW", "mikywow@seznam.cz"),
+    __description__ = """MegaRapid.cz account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("MikyWoW", "mikywow@seznam.cz"),
                        ("zoidberg", "zoidberg@mujmail.cz")]
 
 
diff --git a/pyload/plugin/account/MegasharesCom.py b/pyload/plugin/account/MegasharesCom.py
index 95df5ad2d..352e0abd5 100644
--- a/pyload/plugin/account/MegasharesCom.py
+++ b/pyload/plugin/account/MegasharesCom.py
@@ -7,13 +7,13 @@ from pyload.plugin.Account import Account
 
 
 class MegasharesCom(Account):
-    __name    = "MegasharesCom"
-    __type    = "account"
-    __version = "0.02"
+    __name__    = "MegasharesCom"
+    __type__    = "account"
+    __version__ = "0.02"
 
-    __description = """Megashares.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """Megashares.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     VALID_UNTIL_PATTERN = r'<p class="premium_info_box">Period Ends: (\w{3} \d{1,2}, \d{4})</p>'
diff --git a/pyload/plugin/account/MovReelCom.py b/pyload/plugin/account/MovReelCom.py
index 9eabd0a6d..4d2855de1 100644
--- a/pyload/plugin/account/MovReelCom.py
+++ b/pyload/plugin/account/MovReelCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class MovReelCom(XFSAccount):
-    __name    = "MovReelCom"
-    __type    = "account"
-    __version = "0.03"
+    __name__    = "MovReelCom"
+    __type__    = "account"
+    __version__ = "0.03"
 
-    __description = """Movreel.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")]
+    __description__ = """Movreel.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("t4skforce", "t4skforce1337[AT]gmail[DOT]com")]
 
 
     login_timeout = 60
diff --git a/pyload/plugin/account/MultishareCz.py b/pyload/plugin/account/MultishareCz.py
index 2f9b285b2..62b48c546 100644
--- a/pyload/plugin/account/MultishareCz.py
+++ b/pyload/plugin/account/MultishareCz.py
@@ -6,13 +6,13 @@ from pyload.plugin.Account import Account
 
 
 class MultishareCz(Account):
-    __name    = "MultishareCz"
-    __type    = "account"
-    __version = "0.03"
+    __name__    = "MultishareCz"
+    __type__    = "account"
+    __version__ = "0.03"
 
-    __description = """Multishare.cz account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """Multishare.cz account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     TRAFFIC_LEFT_PATTERN = r'<span class="profil-zvyrazneni">Kredit:</span>\s*<strong>(?P<S>[\d.,]+)&nbsp;(?P<U>[\w^_]+)</strong>'
diff --git a/pyload/plugin/account/MyfastfileCom.py b/pyload/plugin/account/MyfastfileCom.py
index 4e85c1a34..01caf5c69 100644
--- a/pyload/plugin/account/MyfastfileCom.py
+++ b/pyload/plugin/account/MyfastfileCom.py
@@ -7,13 +7,13 @@ from pyload.utils import json_loads
 
 
 class MyfastfileCom(Account):
-    __name    = "MyfastfileCom"
-    __type    = "account"
-    __version = "0.02"
+    __name__    = "MyfastfileCom"
+    __type__    = "account"
+    __version__ = "0.02"
 
-    __description = """Myfastfile.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("stickell", "l.stickell@yahoo.it")]
+    __description__ = """Myfastfile.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/NetloadIn.py b/pyload/plugin/account/NetloadIn.py
index 4cfc205ca..d0d48315a 100644
--- a/pyload/plugin/account/NetloadIn.py
+++ b/pyload/plugin/account/NetloadIn.py
@@ -7,13 +7,13 @@ from pyload.plugin.Account import Account
 
 
 class NetloadIn(Account):
-    __name    = "NetloadIn"
-    __type    = "account"
-    __version = "0.22"
+    __name__    = "NetloadIn"
+    __type__    = "account"
+    __version__ = "0.22"
 
-    __description = """Netload.in account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("RaNaN", "RaNaN@pyload.org"),
+    __description__ = """Netload.in account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("RaNaN", "RaNaN@pyload.org"),
                        ("CryNickSystems", "webmaster@pcProfil.de")]
 
 
diff --git a/pyload/plugin/account/NosuploadCom.py b/pyload/plugin/account/NosuploadCom.py
index 10f9007a6..7fc8b49de 100644
--- a/pyload/plugin/account/NosuploadCom.py
+++ b/pyload/plugin/account/NosuploadCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class NosuploadCom(XFSAccount):
-    __name    = "NosuploadCom"
-    __type    = "account"
-    __version = "0.02"
+    __name__    = "NosuploadCom"
+    __type__    = "account"
+    __version__ = "0.02"
 
-    __description = """Nosupload.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description__ = """Nosupload.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = "nosupload.com"
diff --git a/pyload/plugin/account/NovafileCom.py b/pyload/plugin/account/NovafileCom.py
index 8400cc267..71a7dc2dc 100644
--- a/pyload/plugin/account/NovafileCom.py
+++ b/pyload/plugin/account/NovafileCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class NovafileCom(XFSAccount):
-    __name    = "NovafileCom"
-    __type    = "account"
-    __version = "0.02"
+    __name__    = "NovafileCom"
+    __type__    = "account"
+    __version__ = "0.02"
 
-    __description = """Novafile.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description__ = """Novafile.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = "novafile.com"
diff --git a/pyload/plugin/account/NowVideoAt.py b/pyload/plugin/account/NowVideoAt.py
index 84cec8974..d2527d635 100644
--- a/pyload/plugin/account/NowVideoAt.py
+++ b/pyload/plugin/account/NowVideoAt.py
@@ -8,13 +8,13 @@ from pyload.plugin.Account import Account
 
 
 class NowVideoAt(Account):
-    __name    = "NowVideoAt"
-    __type    = "account"
-    __version = "0.01"
+    __name__    = "NowVideoAt"
+    __type__    = "account"
+    __version__ = "0.01"
 
-    __description = """NowVideo.at account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description__ = """NowVideo.at account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     VALID_UNTIL_PATTERN = r'>Your premium membership expires on: (.+?)<'
diff --git a/pyload/plugin/account/OboomCom.py b/pyload/plugin/account/OboomCom.py
index cfb4e3e7e..a40783535 100644
--- a/pyload/plugin/account/OboomCom.py
+++ b/pyload/plugin/account/OboomCom.py
@@ -9,13 +9,13 @@ from pyload.plugin.Account import Account
 
 
 class OboomCom(Account):
-    __name    = "OboomCom"
-    __type    = "account"
-    __version = "0.21"
+    __name__    = "OboomCom"
+    __type__    = "account"
+    __version__ = "0.21"
 
-    __description = """Oboom.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("stanley", "stanley.foerster@gmail.com")]
+    __description__ = """Oboom.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("stanley", "stanley.foerster@gmail.com")]
 
 
     def loadAccountData(self, user, req):
diff --git a/pyload/plugin/account/OneFichierCom.py b/pyload/plugin/account/OneFichierCom.py
index 7ecd5769e..5d4a037f0 100644
--- a/pyload/plugin/account/OneFichierCom.py
+++ b/pyload/plugin/account/OneFichierCom.py
@@ -10,13 +10,13 @@ from pyload.plugin.Account import Account
 
 
 class OneFichierCom(Account):
-    __name    = "OneFichierCom"
-    __type    = "account"
-    __version = "0.11"
+    __name__    = "OneFichierCom"
+    __type__    = "account"
+    __version__ = "0.11"
 
-    __description = """1fichier.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("Elrick69", "elrick69[AT]rocketmail[DOT]com"),
+    __description__ = """1fichier.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Elrick69", "elrick69[AT]rocketmail[DOT]com"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/pyload/plugin/account/OverLoadMe.py b/pyload/plugin/account/OverLoadMe.py
index 55dbfd1bb..27ed9eb98 100644
--- a/pyload/plugin/account/OverLoadMe.py
+++ b/pyload/plugin/account/OverLoadMe.py
@@ -5,13 +5,13 @@ from pyload.utils import json_loads
 
 
 class OverLoadMe(Account):
-    __name    = "OverLoadMe"
-    __type    = "account"
-    __version = "0.01"
+    __name__    = "OverLoadMe"
+    __type__    = "account"
+    __version__ = "0.01"
 
-    __description = """Over-Load.me account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("marley", "marley@over-load.me")]
+    __description__ = """Over-Load.me account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("marley", "marley@over-load.me")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/PremiumTo.py b/pyload/plugin/account/PremiumTo.py
index 2fe95b135..7f15e8a86 100644
--- a/pyload/plugin/account/PremiumTo.py
+++ b/pyload/plugin/account/PremiumTo.py
@@ -4,13 +4,13 @@ from pyload.plugin.Account import Account
 
 
 class PremiumTo(Account):
-    __name    = "PremiumTo"
-    __type    = "account"
-    __version = "0.04"
+    __name__    = "PremiumTo"
+    __type__    = "account"
+    __version__ = "0.04"
 
-    __description = """Premium.to account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("RaNaN", "RaNaN@pyload.org"),
+    __description__ = """Premium.to account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("RaNaN", "RaNaN@pyload.org"),
                        ("zoidberg", "zoidberg@mujmail.cz"),
                        ("stickell", "l.stickell@yahoo.it")]
 
diff --git a/pyload/plugin/account/PremiumizeMe.py b/pyload/plugin/account/PremiumizeMe.py
index 9ad728bf7..75fc22198 100644
--- a/pyload/plugin/account/PremiumizeMe.py
+++ b/pyload/plugin/account/PremiumizeMe.py
@@ -6,13 +6,13 @@ from pyload.utils import json_loads
 
 
 class PremiumizeMe(Account):
-    __name    = "PremiumizeMe"
-    __type    = "account"
-    __version = "0.11"
+    __name__    = "PremiumizeMe"
+    __type__    = "account"
+    __version__ = "0.11"
 
-    __description = """Premiumize.me account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("Florian Franzen", "FlorianFranzen@gmail.com")]
+    __description__ = """Premiumize.me account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Florian Franzen", "FlorianFranzen@gmail.com")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/QuickshareCz.py b/pyload/plugin/account/QuickshareCz.py
index 216bf62f2..c3d69e0c3 100644
--- a/pyload/plugin/account/QuickshareCz.py
+++ b/pyload/plugin/account/QuickshareCz.py
@@ -6,13 +6,13 @@ from pyload.plugin.Account import Account
 
 
 class QuickshareCz(Account):
-    __name    = "QuickshareCz"
-    __type    = "account"
-    __version = "0.02"
+    __name__    = "QuickshareCz"
+    __type__    = "account"
+    __version__ = "0.02"
 
-    __description = """Quickshare.cz account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """Quickshare.cz account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     TRAFFIC_LEFT_PATTERN = r'Stav kreditu: <strong>(.+?)</strong>'
diff --git a/pyload/plugin/account/RPNetBiz.py b/pyload/plugin/account/RPNetBiz.py
index fe18e06c9..bb529b19c 100644
--- a/pyload/plugin/account/RPNetBiz.py
+++ b/pyload/plugin/account/RPNetBiz.py
@@ -5,13 +5,13 @@ from pyload.utils import json_loads
 
 
 class RPNetBiz(Account):
-    __name    = "RPNetBiz"
-    __type    = "account"
-    __version = "0.10"
+    __name__    = "RPNetBiz"
+    __type__    = "account"
+    __version__ = "0.10"
 
-    __description = """RPNet.biz account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("Dman", "dmanugm@gmail.com")]
+    __description__ = """RPNet.biz account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Dman", "dmanugm@gmail.com")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/RapidfileshareNet.py b/pyload/plugin/account/RapidfileshareNet.py
index 0b0ed210c..ec0bf8db4 100644
--- a/pyload/plugin/account/RapidfileshareNet.py
+++ b/pyload/plugin/account/RapidfileshareNet.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class RapidfileshareNet(XFSAccount):
-    __name    = "RapidfileshareNet"
-    __type    = "account"
-    __version = "0.05"
+    __name__    = "RapidfileshareNet"
+    __type__    = "account"
+    __version__ = "0.05"
 
-    __description = """Rapidfileshare.net account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("guidobelix", "guidobelix@hotmail.it")]
+    __description__ = """Rapidfileshare.net account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("guidobelix", "guidobelix@hotmail.it")]
 
 
     HOSTER_DOMAIN = "rapidfileshare.net"
diff --git a/pyload/plugin/account/RapidgatorNet.py b/pyload/plugin/account/RapidgatorNet.py
index 66fe13f90..693b78547 100644
--- a/pyload/plugin/account/RapidgatorNet.py
+++ b/pyload/plugin/account/RapidgatorNet.py
@@ -5,13 +5,13 @@ from pyload.utils import json_loads
 
 
 class RapidgatorNet(Account):
-    __name    = "RapidgatorNet"
-    __type    = "account"
-    __version = "0.04"
+    __name__    = "RapidgatorNet"
+    __type__    = "account"
+    __version__ = "0.04"
 
-    __description = """Rapidgator.net account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """Rapidgator.net account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     API_URL = 'http://rapidgator.net/api/user'
diff --git a/pyload/plugin/account/RapiduNet.py b/pyload/plugin/account/RapiduNet.py
index dfb18d2c7..2c6fe04f8 100644
--- a/pyload/plugin/account/RapiduNet.py
+++ b/pyload/plugin/account/RapiduNet.py
@@ -7,13 +7,13 @@ from pyload.utils import json_loads
 
 
 class RapiduNet(Account):
-    __name    = "RapiduNet"
-    __type    = "account"
-    __version = "0.02"
+    __name__    = "RapiduNet"
+    __type__    = "account"
+    __version__ = "0.02"
 
-    __description = """Rapidu.net account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("prOq", "")]
+    __description__ = """Rapidu.net account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("prOq", "")]
 
 
     PREMIUM_PATTERN = r'<a href="premium/" style="padding-left: 0px;">Account: <b>Premium</b></a>'
diff --git a/pyload/plugin/account/RarefileNet.py b/pyload/plugin/account/RarefileNet.py
index fc736bafc..1dc93681c 100644
--- a/pyload/plugin/account/RarefileNet.py
+++ b/pyload/plugin/account/RarefileNet.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class RarefileNet(XFSAccount):
-    __name    = "RarefileNet"
-    __type    = "account"
-    __version = "0.04"
+    __name__    = "RarefileNet"
+    __type__    = "account"
+    __version__ = "0.04"
 
-    __description = """RareFile.net account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """RareFile.net account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     HOSTER_DOMAIN = "rarefile.net"
diff --git a/pyload/plugin/account/RealdebridCom.py b/pyload/plugin/account/RealdebridCom.py
index c604fb108..d5aa2163c 100644
--- a/pyload/plugin/account/RealdebridCom.py
+++ b/pyload/plugin/account/RealdebridCom.py
@@ -6,13 +6,13 @@ from pyload.plugin.Account import Account
 
 
 class RealdebridCom(Account):
-    __name    = "RealdebridCom"
-    __type    = "account"
-    __version = "0.43"
+    __name__    = "RealdebridCom"
+    __type__    = "account"
+    __version__ = "0.43"
 
-    __description = """Real-Debrid.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("Devirex Hazzard", "naibaf_11@yahoo.de")]
+    __description__ = """Real-Debrid.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Devirex Hazzard", "naibaf_11@yahoo.de")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/RehostTo.py b/pyload/plugin/account/RehostTo.py
index 956982186..bcc34d47f 100644
--- a/pyload/plugin/account/RehostTo.py
+++ b/pyload/plugin/account/RehostTo.py
@@ -4,13 +4,13 @@ from pyload.plugin.Account import Account
 
 
 class RehostTo(Account):
-    __name    = "RehostTo"
-    __type    = "account"
-    __version = "0.10"
+    __name__    = "RehostTo"
+    __type__    = "account"
+    __version__ = "0.10"
 
-    __description = """Rehost.to account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("RaNaN", "RaNaN@pyload.org")]
+    __description__ = """Rehost.to account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("RaNaN", "RaNaN@pyload.org")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/RyushareCom.py b/pyload/plugin/account/RyushareCom.py
index d908e6442..fcef2d634 100644
--- a/pyload/plugin/account/RyushareCom.py
+++ b/pyload/plugin/account/RyushareCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class RyushareCom(XFSAccount):
-    __name    = "RyushareCom"
-    __type    = "account"
-    __version = "0.05"
+    __name__    = "RyushareCom"
+    __type__    = "account"
+    __version__ = "0.05"
 
-    __description = """Ryushare.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),
+    __description__ = """Ryushare.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
                        ("trance4us", "")]
 
 
diff --git a/pyload/plugin/account/SafesharingEu.py b/pyload/plugin/account/SafesharingEu.py
index eae8140fb..f5cbf050e 100644
--- a/pyload/plugin/account/SafesharingEu.py
+++ b/pyload/plugin/account/SafesharingEu.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class SafesharingEu(XFSAccount):
-    __name    = "SafesharingEu"
-    __type    = "account"
-    __version = "0.02"
+    __name__    = "SafesharingEu"
+    __type__    = "account"
+    __version__ = "0.02"
 
-    __description = """Safesharing.eu account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("guidobelix", "guidobelix@hotmail.it")]
+    __description__ = """Safesharing.eu account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("guidobelix", "guidobelix@hotmail.it")]
 
 
     HOSTER_DOMAIN = "safesharing.eu"
diff --git a/pyload/plugin/account/SecureUploadEu.py b/pyload/plugin/account/SecureUploadEu.py
index b349e893f..bb47bcba3 100644
--- a/pyload/plugin/account/SecureUploadEu.py
+++ b/pyload/plugin/account/SecureUploadEu.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class SecureUploadEu(XFSAccount):
-    __name    = "SecureUploadEu"
-    __type    = "account"
-    __version = "0.02"
+    __name__    = "SecureUploadEu"
+    __type__    = "account"
+    __version__ = "0.02"
 
-    __description = """SecureUpload.eu account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description__ = """SecureUpload.eu account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = "secureupload.eu"
diff --git a/pyload/plugin/account/SendmywayCom.py b/pyload/plugin/account/SendmywayCom.py
index add0b2183..d64658de3 100644
--- a/pyload/plugin/account/SendmywayCom.py
+++ b/pyload/plugin/account/SendmywayCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class SendmywayCom(XFSAccount):
-    __name    = "SendmywayCom"
-    __type    = "account"
-    __version = "0.02"
+    __name__    = "SendmywayCom"
+    __type__    = "account"
+    __version__ = "0.02"
 
-    __description = """Sendmyway.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description__ = """Sendmyway.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = "sendmyway.com"
diff --git a/pyload/plugin/account/ShareonlineBiz.py b/pyload/plugin/account/ShareonlineBiz.py
index 1b167a568..17425ac07 100644
--- a/pyload/plugin/account/ShareonlineBiz.py
+++ b/pyload/plugin/account/ShareonlineBiz.py
@@ -4,13 +4,13 @@ from pyload.plugin.Account import Account
 
 
 class ShareonlineBiz(Account):
-    __name    = "ShareonlineBiz"
-    __type    = "account"
-    __version = "0.24"
+    __name__    = "ShareonlineBiz"
+    __type__    = "account"
+    __version__ = "0.24"
 
-    __description = """Share-online.biz account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("mkaay", "mkaay@mkaay.de"),
+    __description__ = """Share-online.biz account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("mkaay", "mkaay@mkaay.de"),
                        ("zoidberg", "zoidberg@mujmail.cz")]
 
 
diff --git a/pyload/plugin/account/SimplyPremiumCom.py b/pyload/plugin/account/SimplyPremiumCom.py
index af8fc0730..0872e10f5 100644
--- a/pyload/plugin/account/SimplyPremiumCom.py
+++ b/pyload/plugin/account/SimplyPremiumCom.py
@@ -5,13 +5,13 @@ from pyload.plugin.Account import Account
 
 
 class SimplyPremiumCom(Account):
-    __name    = "SimplyPremiumCom"
-    __type    = "account"
-    __version = "0.01"
+    __name__    = "SimplyPremiumCom"
+    __type__    = "account"
+    __version__ = "0.01"
 
-    __description = """Simply-Premium.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("EvolutionClip", "evolutionclip@live.de")]
+    __description__ = """Simply-Premium.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("EvolutionClip", "evolutionclip@live.de")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/SimplydebridCom.py b/pyload/plugin/account/SimplydebridCom.py
index 24d0cb6bf..38ff90737 100644
--- a/pyload/plugin/account/SimplydebridCom.py
+++ b/pyload/plugin/account/SimplydebridCom.py
@@ -6,13 +6,13 @@ from pyload.plugin.Account import Account
 
 
 class SimplydebridCom(Account):
-    __name    = "SimplydebridCom"
-    __type    = "account"
-    __version = "0.10"
+    __name__    = "SimplydebridCom"
+    __type__    = "account"
+    __version__ = "0.10"
 
-    __description = """Simply-Debrid.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("Kagenoshin", "kagenoshin@gmx.ch")]
+    __description__ = """Simply-Debrid.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Kagenoshin", "kagenoshin@gmx.ch")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/StahnuTo.py b/pyload/plugin/account/StahnuTo.py
index b3ca3891a..adc7ab789 100644
--- a/pyload/plugin/account/StahnuTo.py
+++ b/pyload/plugin/account/StahnuTo.py
@@ -6,13 +6,13 @@ from pyload.plugin.Account import Account
 
 
 class StahnuTo(Account):
-    __name    = "StahnuTo"
-    __type    = "account"
-    __version = "0.03"
+    __name__    = "StahnuTo"
+    __type__    = "account"
+    __version__ = "0.03"
 
-    __description = """StahnuTo account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """StahnuTo account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/StreamcloudEu.py b/pyload/plugin/account/StreamcloudEu.py
index f3eb6cce9..3ac74fbd0 100644
--- a/pyload/plugin/account/StreamcloudEu.py
+++ b/pyload/plugin/account/StreamcloudEu.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class StreamcloudEu(XFSAccount):
-    __name    = "StreamcloudEu"
-    __type    = "account"
-    __version = "0.02"
+    __name__    = "StreamcloudEu"
+    __type__    = "account"
+    __version__ = "0.02"
 
-    __description = """Streamcloud.eu account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description__ = """Streamcloud.eu account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = "streamcloud.eu"
diff --git a/pyload/plugin/account/TurbobitNet.py b/pyload/plugin/account/TurbobitNet.py
index 8237ed34e..1086ede2a 100644
--- a/pyload/plugin/account/TurbobitNet.py
+++ b/pyload/plugin/account/TurbobitNet.py
@@ -7,13 +7,13 @@ from pyload.plugin.Account import Account
 
 
 class TurbobitNet(Account):
-    __name    = "TurbobitNet"
-    __type    = "account"
-    __version = "0.01"
+    __name__    = "TurbobitNet"
+    __type__    = "account"
+    __version__ = "0.01"
 
-    __description = """TurbobitNet account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """TurbobitNet account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/TusfilesNet.py b/pyload/plugin/account/TusfilesNet.py
index b951f8add..84e9ef9c6 100644
--- a/pyload/plugin/account/TusfilesNet.py
+++ b/pyload/plugin/account/TusfilesNet.py
@@ -8,13 +8,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class TusfilesNet(XFSAccount):
-    __name    = "TusfilesNet"
-    __type    = "account"
-    __version = "0.06"
+    __name__    = "TusfilesNet"
+    __type__    = "account"
+    __version__ = "0.06"
 
-    __description = """Tusfile.net account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("guidobelix", "guidobelix@hotmail.it")]
+    __description__ = """Tusfile.net account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("guidobelix", "guidobelix@hotmail.it")]
 
 
     HOSTER_DOMAIN = "tusfiles.net"
diff --git a/pyload/plugin/account/UlozTo.py b/pyload/plugin/account/UlozTo.py
index bba346874..57031ce1f 100644
--- a/pyload/plugin/account/UlozTo.py
+++ b/pyload/plugin/account/UlozTo.py
@@ -8,13 +8,13 @@ from pyload.plugin.Account import Account
 
 
 class UlozTo(Account):
-    __name    = "UlozTo"
-    __type    = "account"
-    __version = "0.07"
+    __name__    = "UlozTo"
+    __type__    = "account"
+    __version__ = "0.07"
 
-    __description = """Uloz.to account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),
+    __description__ = """Uloz.to account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
                        ("pulpe", "")]
 
 
diff --git a/pyload/plugin/account/UnrestrictLi.py b/pyload/plugin/account/UnrestrictLi.py
index 943943cac..07e7d3e17 100644
--- a/pyload/plugin/account/UnrestrictLi.py
+++ b/pyload/plugin/account/UnrestrictLi.py
@@ -5,13 +5,13 @@ from pyload.utils import json_loads
 
 
 class UnrestrictLi(Account):
-    __name    = "UnrestrictLi"
-    __type    = "account"
-    __version = "0.03"
+    __name__    = "UnrestrictLi"
+    __type__    = "account"
+    __version__ = "0.03"
 
-    __description = """Unrestrict.li account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("stickell", "l.stickell@yahoo.it")]
+    __description__ = """Unrestrict.li account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/UploadcCom.py b/pyload/plugin/account/UploadcCom.py
index 01102168c..66863c456 100644
--- a/pyload/plugin/account/UploadcCom.py
+++ b/pyload/plugin/account/UploadcCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class UploadcCom(XFSAccount):
-    __name    = "UploadcCom"
-    __type    = "account"
-    __version = "0.02"
+    __name__    = "UploadcCom"
+    __type__    = "account"
+    __version__ = "0.02"
 
-    __description = """Uploadc.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description__ = """Uploadc.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = "uploadc.com"
diff --git a/pyload/plugin/account/UploadedTo.py b/pyload/plugin/account/UploadedTo.py
index f25da8995..91cdba2c1 100644
--- a/pyload/plugin/account/UploadedTo.py
+++ b/pyload/plugin/account/UploadedTo.py
@@ -7,13 +7,13 @@ from pyload.plugin.Account import Account
 
 
 class UploadedTo(Account):
-    __name    = "UploadedTo"
-    __type    = "account"
-    __version = "0.27"
+    __name__    = "UploadedTo"
+    __type__    = "account"
+    __version__ = "0.27"
 
-    __description = """Uploaded.to account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("mkaay", "mkaay@mkaay.de")]
+    __description__ = """Uploaded.to account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("mkaay", "mkaay@mkaay.de")]
 
 
     PREMIUM_PATTERN = r'<em>Premium</em>'
diff --git a/pyload/plugin/account/UploadheroCom.py b/pyload/plugin/account/UploadheroCom.py
index fa7af288e..c7b05bc94 100644
--- a/pyload/plugin/account/UploadheroCom.py
+++ b/pyload/plugin/account/UploadheroCom.py
@@ -8,13 +8,13 @@ from pyload.plugin.Account import Account
 
 
 class UploadheroCom(Account):
-    __name    = "UploadheroCom"
-    __type    = "account"
-    __version = "0.20"
+    __name__    = "UploadheroCom"
+    __type__    = "account"
+    __version__ = "0.20"
 
-    __description = """Uploadhero.co account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("mcmyst", "mcmyst@hotmail.fr")]
+    __description__ = """Uploadhero.co account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("mcmyst", "mcmyst@hotmail.fr")]
 
 
     def loadAccountInfo(self, user, req):
diff --git a/pyload/plugin/account/UploadingCom.py b/pyload/plugin/account/UploadingCom.py
index 7ac1e52ff..6d54469e8 100644
--- a/pyload/plugin/account/UploadingCom.py
+++ b/pyload/plugin/account/UploadingCom.py
@@ -9,13 +9,13 @@ from pyload.plugin.internal.SimpleHoster import set_cookies
 
 
 class UploadingCom(Account):
-    __name    = "UploadingCom"
-    __type    = "account"
-    __version = "0.11"
+    __name__    = "UploadingCom"
+    __type__    = "account"
+    __version__ = "0.11"
 
-    __description = """Uploading.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("mkaay", "mkaay@mkaay.de")]
+    __description__ = """Uploading.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("mkaay", "mkaay@mkaay.de")]
 
 
     PREMIUM_PATTERN = r'UPGRADE TO PREMIUM'
diff --git a/pyload/plugin/account/UptoboxCom.py b/pyload/plugin/account/UptoboxCom.py
index 116721ebe..2d0b49957 100644
--- a/pyload/plugin/account/UptoboxCom.py
+++ b/pyload/plugin/account/UptoboxCom.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class UptoboxCom(XFSAccount):
-    __name    = "UptoboxCom"
-    __type    = "account"
-    __version = "0.07"
+    __name__    = "UptoboxCom"
+    __type__    = "account"
+    __version__ = "0.07"
 
-    __description = """DDLStorage.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """DDLStorage.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     HOSTER_DOMAIN = "uptobox.com"
diff --git a/pyload/plugin/account/VidPlayNet.py b/pyload/plugin/account/VidPlayNet.py
index c5d4e0b5a..390520a00 100644
--- a/pyload/plugin/account/VidPlayNet.py
+++ b/pyload/plugin/account/VidPlayNet.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class VidPlayNet(XFSAccount):
-    __name    = "VidPlayNet"
-    __type    = "account"
-    __version = "0.02"
+    __name__    = "VidPlayNet"
+    __type__    = "account"
+    __version__ = "0.02"
 
-    __description = """VidPlay.net account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description__ = """VidPlay.net account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = "vidplay.net"
diff --git a/pyload/plugin/account/XFileSharingPro.py b/pyload/plugin/account/XFileSharingPro.py
index 67679f2cc..9d938c4c5 100644
--- a/pyload/plugin/account/XFileSharingPro.py
+++ b/pyload/plugin/account/XFileSharingPro.py
@@ -4,13 +4,13 @@ from pyload.plugin.internal.XFSAccount import XFSAccount
 
 
 class XFileSharingPro(XFSAccount):
-    __name    = "XFileSharingPro"
-    __type    = "account"
-    __version = "0.05"
+    __name__    = "XFileSharingPro"
+    __type__    = "account"
+    __version__ = "0.05"
 
-    __description = """XFileSharingPro multi-purpose account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description__ = """XFileSharingPro multi-purpose account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     HOSTER_DOMAIN = None
diff --git a/pyload/plugin/account/YibaishiwuCom.py b/pyload/plugin/account/YibaishiwuCom.py
index 6f149478e..e169a5901 100644
--- a/pyload/plugin/account/YibaishiwuCom.py
+++ b/pyload/plugin/account/YibaishiwuCom.py
@@ -6,13 +6,13 @@ from pyload.plugin.Account import Account
 
 
 class YibaishiwuCom(Account):
-    __name    = "YibaishiwuCom"
-    __type    = "account"
-    __version = "0.01"
+    __name__    = "YibaishiwuCom"
+    __type__    = "account"
+    __version__ = "0.01"
 
-    __description = """115.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """115.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     ACCOUNT_INFO_PATTERN = r'var USER_PERMISSION = {(.*?)}'
diff --git a/pyload/plugin/account/ZeveraCom.py b/pyload/plugin/account/ZeveraCom.py
index aab795e55..2eee62ac1 100644
--- a/pyload/plugin/account/ZeveraCom.py
+++ b/pyload/plugin/account/ZeveraCom.py
@@ -6,13 +6,13 @@ from pyload.plugin.Account import Account
 
 
 class ZeveraCom(Account):
-    __name    = "ZeveraCom"
-    __type    = "account"
-    __version = "0.21"
+    __name__    = "ZeveraCom"
+    __type__    = "account"
+    __version__ = "0.21"
 
-    __description = """Zevera.com account plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """Zevera.com account plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     def loadAccountInfo(self, user, req):