Partially revert acc46fc3497a66a427b795b4a22c6e71d69185a1

author: Walter Purcaro <vuolter@gmail.com> 2015-02-16 03:40:45 +0100
committer: Walter Purcaro <vuolter@gmail.com> 2015-02-16 03:40:45 +0100
commit: fcead1870013b6a970eca7878a66dbe783c80ea3 (patch)
tree: 9837d3b2cacba2f5d1a4c620b1cd02f26571b454 /pyload/plugin/crypter
parent: Init cosmetics (diff)
download: pyload-fcead1870013b6a970eca7878a66dbe783c80ea3.tar.xz
83 files changed, 680 insertions, 680 deletions
diff --git a/pyload/plugin/crypter/BitshareCom.py b/pyload/plugin/crypter/BitshareCom.py
index dfa7b71df..524307127 100644
--- a/pyload/plugin/crypter/BitshareCom.py
+++ b/pyload/plugin/crypter/BitshareCom.py
@@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class BitshareCom(SimpleCrypter):
-    __name    = "BitshareCom"
-    __type    = "crypter"
-    __version = "0.03"
+    __name__    = "BitshareCom"
+    __type__    = "crypter"
+    __version__ = "0.03"
 
-    __pattern = r'http://(?:www\.)?bitshare\.com/\?d=\w+'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?bitshare\.com/\?d=\w+'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Bitshare.com folder decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("stickell", "l.stickell@yahoo.it")]
+    __description__ = """Bitshare.com folder decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
     LINK_PATTERN = r'<a href="(http://bitshare\.com/files/.+)">.+</a></td>'
diff --git a/pyload/plugin/crypter/C1neonCom.py b/pyload/plugin/crypter/C1neonCom.py
index ad428f6dd..a7973b041 100644
--- a/pyload/plugin/crypter/C1neonCom.py
+++ b/pyload/plugin/crypter/C1neonCom.py
@@ -4,16 +4,16 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class C1neonCom(DeadCrypter):
-    __name    = "C1neonCom"
-    __type    = "crypter"
-    __version = "0.05"
+    __name__    = "C1neonCom"
+    __type__    = "crypter"
+    __version__ = "0.05"
 
-    __pattern = r'http://(?:www\.)?c1neon\.com/.*?'
-    __config  = []
+    __pattern__ = r'http://(?:www\.)?c1neon\.com/.*?'
+    __config__  = []
 
-    __description = """C1neon.com decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("godofdream", "soilfiction@gmail.com")]
+    __description__ = """C1neon.com decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("godofdream", "soilfiction@gmail.com")]
 
 
 getInfo = create_getInfo(C1neonCom)
diff --git a/pyload/plugin/crypter/ChipDe.py b/pyload/plugin/crypter/ChipDe.py
index 36735fd13..3e00a7f66 100644
--- a/pyload/plugin/crypter/ChipDe.py
+++ b/pyload/plugin/crypter/ChipDe.py
@@ -5,17 +5,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class ChipDe(Crypter):
-    __name    = "ChipDe"
-    __type    = "crypter"
-    __version = "0.10"
+    __name__    = "ChipDe"
+    __type__    = "crypter"
+    __version__ = "0.10"
 
-    __pattern = r'http://(?:www\.)?chip\.de/video/.*\.html'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?chip\.de/video/.*\.html'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Chip.de decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("4Christopher", "4Christopher@gmx.de")]
+    __description__ = """Chip.de decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("4Christopher", "4Christopher@gmx.de")]
 
 
     def decrypt(self, pyfile):
diff --git a/pyload/plugin/crypter/CrockoCom.py b/pyload/plugin/crypter/CrockoCom.py
index 8782c86e6..577433510 100644
--- a/pyload/plugin/crypter/CrockoCom.py
+++ b/pyload/plugin/crypter/CrockoCom.py
@@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class CrockoCom(SimpleCrypter):
-    __name    = "CrockoCom"
-    __type    = "crypter"
-    __version = "0.01"
+    __name__    = "CrockoCom"
+    __type__    = "crypter"
+    __version__ = "0.01"
 
-    __pattern = r'http://(?:www\.)?crocko\.com/f/.*'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?crocko\.com/f/.*'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Crocko.com folder decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """Crocko.com folder decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     LINK_PATTERN = r'<td class="last"><a href="([^"]+)">download</a>'
diff --git a/pyload/plugin/crypter/CryptItCom.py b/pyload/plugin/crypter/CryptItCom.py
index dfb6be954..cb3347f55 100644
--- a/pyload/plugin/crypter/CryptItCom.py
+++ b/pyload/plugin/crypter/CryptItCom.py
@@ -4,16 +4,16 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class CryptItCom(DeadCrypter):
-    __name    = "CryptItCom"
-    __type    = "crypter"
-    __version = "0.11"
+    __name__    = "CryptItCom"
+    __type__    = "crypter"
+    __version__ = "0.11"
 
-    __pattern = r'http://(?:www\.)?crypt-it\.com/(s|e|d|c)/\w+'
-    __config  = []
+    __pattern__ = r'http://(?:www\.)?crypt-it\.com/(s|e|d|c)/\w+'
+    __config__  = []
 
-    __description = """Crypt-it.com decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("jeix", "jeix@hasnomail.de")]
+    __description__ = """Crypt-it.com decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("jeix", "jeix@hasnomail.de")]
 
 
 getInfo = create_getInfo(CryptItCom)
diff --git a/pyload/plugin/crypter/CzshareCom.py b/pyload/plugin/crypter/CzshareCom.py
index e36394426..71847ab48 100644
--- a/pyload/plugin/crypter/CzshareCom.py
+++ b/pyload/plugin/crypter/CzshareCom.py
@@ -5,17 +5,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class CzshareCom(Crypter):
-    __name    = "CzshareCom"
-    __type    = "crypter"
-    __version = "0.20"
+    __name__    = "CzshareCom"
+    __type__    = "crypter"
+    __version__ = "0.20"
 
-    __pattern = r'http://(?:www\.)?(czshare|sdilej)\.(com|cz)/folders/.*'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?(czshare|sdilej)\.(com|cz)/folders/.*'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Czshare.com folder decrypter plugin, now Sdilej.cz"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """Czshare.com folder decrypter plugin, now Sdilej.cz"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     FOLDER_PATTERN = r'<tr class="subdirectory">\s*<td>\s*<table>(.*?)</table>'
diff --git a/pyload/plugin/crypter/DDLMusicOrg.py b/pyload/plugin/crypter/DDLMusicOrg.py
index a24cac22d..2b6738799 100644
--- a/pyload/plugin/crypter/DDLMusicOrg.py
+++ b/pyload/plugin/crypter/DDLMusicOrg.py
@@ -8,17 +8,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class DDLMusicOrg(Crypter):
-    __name    = "DDLMusicOrg"
-    __type    = "crypter"
-    __version = "0.30"
+    __name__    = "DDLMusicOrg"
+    __type__    = "crypter"
+    __version__ = "0.30"
 
-    __pattern = r'http://(?:www\.)?ddl-music\.org/captcha/ddlm_cr\d\.php\?\d+\?\d+'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?ddl-music\.org/captcha/ddlm_cr\d\.php\?\d+\?\d+'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Ddl-music.org decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("mkaay", "mkaay@mkaay.de")]
+    __description__ = """Ddl-music.org decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("mkaay", "mkaay@mkaay.de")]
 
 
     def setup(self):
diff --git a/pyload/plugin/crypter/DailymotionBatch.py b/pyload/plugin/crypter/DailymotionBatch.py
index 4b5b7106c..a056c73a4 100644
--- a/pyload/plugin/crypter/DailymotionBatch.py
+++ b/pyload/plugin/crypter/DailymotionBatch.py
@@ -10,17 +10,17 @@ from pyload.utils import safe_join
 
 
 class DailymotionBatch(Crypter):
-    __name    = "DailymotionBatch"
-    __type    = "crypter"
-    __version = "0.01"
+    __name__    = "DailymotionBatch"
+    __type__    = "crypter"
+    __version__ = "0.01"
 
-    __pattern = r'https?://(?:www\.)?dailymotion\.com/((playlists/)?(?P<TYPE>playlist|user)/)?(?P<ID>[\w^_]+)(?(TYPE)|#)'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'https?://(?:www\.)?dailymotion\.com/((playlists/)?(?P<TYPE>playlist|user)/)?(?P<ID>[\w^_]+)(?(TYPE)|#)'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Dailymotion.com channel & playlist decrypter"""
-    __license     = "GPLv3"
-    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description__ = """Dailymotion.com channel & playlist decrypter"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     def api_response(self, ref, req=None):
@@ -83,7 +83,7 @@ class DailymotionBatch(Crypter):
 
 
     def decrypt(self, pyfile):
-        m = re.match(self.__pattern, pyfile.url)
+        m = re.match(self.__pattern__, pyfile.url)
         m_id = m.group("ID")
         m_type = m.group("TYPE")
 
diff --git a/pyload/plugin/crypter/DataHu.py b/pyload/plugin/crypter/DataHu.py
index bc677253a..f69d6ee3e 100644
--- a/pyload/plugin/crypter/DataHu.py
+++ b/pyload/plugin/crypter/DataHu.py
@@ -6,17 +6,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class DataHu(SimpleCrypter):
-    __name    = "DataHu"
-    __type    = "crypter"
-    __version = "0.06"
+    __name__    = "DataHu"
+    __type__    = "crypter"
+    __version__ = "0.06"
 
-    __pattern = r'http://(?:www\.)?data\.hu/dir/\w+'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?data\.hu/dir/\w+'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Data.hu folder decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("crash", ""),
+    __description__ = """Data.hu folder decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("crash", ""),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/pyload/plugin/crypter/DdlstorageCom.py b/pyload/plugin/crypter/DdlstorageCom.py
index c6f423bb6..1d87e975b 100644
--- a/pyload/plugin/crypter/DdlstorageCom.py
+++ b/pyload/plugin/crypter/DdlstorageCom.py
@@ -4,16 +4,16 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class DdlstorageCom(DeadCrypter):
-    __name    = "DdlstorageCom"
-    __type    = "crypter"
-    __version = "0.03"
+    __name__    = "DdlstorageCom"
+    __type__    = "crypter"
+    __version__ = "0.03"
 
-    __pattern = r'https?://(?:www\.)?ddlstorage\.com/folder/\w+'
-    __config  = []
+    __pattern__ = r'https?://(?:www\.)?ddlstorage\.com/folder/\w+'
+    __config__  = []
 
-    __description = """DDLStorage.com folder decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("godofdream", "soilfiction@gmail.com"),
+    __description__ = """DDLStorage.com folder decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("godofdream", "soilfiction@gmail.com"),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/pyload/plugin/crypter/DepositfilesCom.py b/pyload/plugin/crypter/DepositfilesCom.py
index 8ecbb6f8d..24fa9134a 100644
--- a/pyload/plugin/crypter/DepositfilesCom.py
+++ b/pyload/plugin/crypter/DepositfilesCom.py
@@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class DepositfilesCom(SimpleCrypter):
-    __name    = "DepositfilesCom"
-    __type    = "crypter"
-    __version = "0.01"
+    __name__    = "DepositfilesCom"
+    __type__    = "crypter"
+    __version__ = "0.01"
 
-    __pattern = r'http://(?:www\.)?depositfiles\.com/folders/\w+'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?depositfiles\.com/folders/\w+'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Depositfiles.com folder decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """Depositfiles.com folder decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     LINK_PATTERN = r'<div class="progressName"[^>]*>\s*<a href="([^"]+)" title="[^"]*" target="_blank">'
diff --git a/pyload/plugin/crypter/Dereferer.py b/pyload/plugin/crypter/Dereferer.py
index ec7f48a52..598cba8bd 100644
--- a/pyload/plugin/crypter/Dereferer.py
+++ b/pyload/plugin/crypter/Dereferer.py
@@ -8,19 +8,19 @@ from pyload.plugin.Crypter import Crypter
 
 
 class Dereferer(Crypter):
-    __name    = "Dereferer"
-    __type    = "crypter"
-    __version = "0.10"
+    __name__    = "Dereferer"
+    __type__    = "crypter"
+    __version__ = "0.10"
 
-    __pattern = r'https?://([^/]+)/.*?(?P<url>(ht|f)tps?(://|%3A%2F%2F).*)'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'https?://([^/]+)/.*?(?P<url>(ht|f)tps?(://|%3A%2F%2F).*)'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Crypter for dereferers"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """Crypter for dereferers"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     def decrypt(self, pyfile):
-        link = re.match(self.__pattern, pyfile.url).group('url')
+        link = re.match(self.__pattern__, pyfile.url).group('url')
         self.urls = [unquote(link).rstrip('+')]
diff --git a/pyload/plugin/crypter/DevhostStFolder.py b/pyload/plugin/crypter/DevhostStFolder.py
index aa00fe60e..9c81879c6 100644
--- a/pyload/plugin/crypter/DevhostStFolder.py
+++ b/pyload/plugin/crypter/DevhostStFolder.py
@@ -11,17 +11,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class DevhostStFolder(SimpleCrypter):
-    __name    = "DevhostStFolder"
-    __type    = "crypter"
-    __version = "0.03"
+    __name__    = "DevhostStFolder"
+    __type__    = "crypter"
+    __version__ = "0.03"
 
-    __pattern = r'http://(?:www\.)?d-h\.st/users/(?P<USER>\w+)(/\?fld_id=(?P<ID>\d+))?'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?d-h\.st/users/(?P<USER>\w+)(/\?fld_id=(?P<ID>\d+))?'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """d-h.st folder decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de"),
+    __description__ = """d-h.st folder decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
@@ -34,7 +34,7 @@ class DevhostStFolder(SimpleCrypter):
             self.offline()
 
         try:
-            id = re.match(self.__pattern, self.pyfile.url).group('ID')
+            id = re.match(self.__pattern__, self.pyfile.url).group('ID')
             if id == "0":
                 raise
 
@@ -49,7 +49,7 @@ class DevhostStFolder(SimpleCrypter):
 
         except Exception, e:
             self.logDebug(e)
-            name = folder = re.match(self.__pattern, self.pyfile.url).group('USER')
+            name = folder = re.match(self.__pattern__, self.pyfile.url).group('USER')
 
         return {'name': name, 'folder': folder}
 
diff --git a/pyload/plugin/crypter/DlProtectCom.py b/pyload/plugin/crypter/DlProtectCom.py
index 0a9f00cc4..539cdc21c 100644
--- a/pyload/plugin/crypter/DlProtectCom.py
+++ b/pyload/plugin/crypter/DlProtectCom.py
@@ -9,17 +9,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class DlProtectCom(SimpleCrypter):
-    __name    = "DlProtectCom"
-    __type    = "crypter"
-    __version = "0.01"
+    __name__    = "DlProtectCom"
+    __type__    = "crypter"
+    __version__ = "0.01"
 
-    __pattern = r'http://(?:www\.)?dl-protect\.com/((en|fr)/)?(?P<ID>\w+)'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?dl-protect\.com/((en|fr)/)?(?P<ID>\w+)'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Dl-protect.com decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description__ = """Dl-protect.com decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     OFFLINE_PATTERN = r'>Unfortunately, the link you are looking for is not found'
@@ -30,7 +30,7 @@ class DlProtectCom(SimpleCrypter):
         if not re.match(r"http://(?:www\.)?dl-protect\.com", self.req.http.lastEffectiveURL):
             return [self.req.http.lastEffectiveURL]
 
-        #id = re.match(self.__pattern, self.pyfile.url).group("ID")
+        #id = re.match(self.__pattern__, self.pyfile.url).group("ID")
         key = re.search(r'name="id_key" value="(.+?)"', self.html).group(1)
 
         post_req = {"id_key": key, "submitform": ""}
diff --git a/pyload/plugin/crypter/DontKnowMe.py b/pyload/plugin/crypter/DontKnowMe.py
index 7fc1c87e4..c2b9649ed 100644
--- a/pyload/plugin/crypter/DontKnowMe.py
+++ b/pyload/plugin/crypter/DontKnowMe.py
@@ -8,17 +8,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class DontKnowMe(Crypter):
-    __name    = "DontKnowMe"
-    __type    = "crypter"
-    __version = "0.10"
+    __name__    = "DontKnowMe"
+    __type__    = "crypter"
+    __version__ = "0.10"
 
-    __pattern = r'http://(?:www\.)?dontknow\.me/at/\?.+$'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?dontknow\.me/at/\?.+$'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """DontKnow.me decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("selaux", "")]
+    __description__ = """DontKnow.me decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("selaux", "")]
 
 
     LINK_PATTERN = r'http://dontknow\.me/at/\?(.+)$'
diff --git a/pyload/plugin/crypter/DuckCryptInfo.py b/pyload/plugin/crypter/DuckCryptInfo.py
index 28f9a1505..55681fd5e 100644
--- a/pyload/plugin/crypter/DuckCryptInfo.py
+++ b/pyload/plugin/crypter/DuckCryptInfo.py
@@ -8,17 +8,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class DuckCryptInfo(Crypter):
-    __name    = "DuckCryptInfo"
-    __type    = "crypter"
-    __version = "0.02"
+    __name__    = "DuckCryptInfo"
+    __type__    = "crypter"
+    __version__ = "0.02"
 
-    __pattern = r'http://(?:www\.)?duckcrypt\.info/(folder|wait|link)/(\w+)/?(\w*)'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?duckcrypt\.info/(folder|wait|link)/(\w+)/?(\w*)'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """DuckCrypt.info decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("godofdream", "soilfiction@gmail.com")]
+    __description__ = """DuckCrypt.info decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("godofdream", "soilfiction@gmail.com")]
 
 
     TIMER_PATTERN = r'<span id="timer">(.*)</span>'
@@ -27,7 +27,7 @@ class DuckCryptInfo(Crypter):
     def decrypt(self, pyfile):
         url = pyfile.url
 
-        m = re.match(self.__pattern, url)
+        m = re.match(self.__pattern__, url)
         if m is None:
             self.fail(_("Weird error in link"))
         if str(m.group(1)) == "link":
@@ -38,7 +38,7 @@ class DuckCryptInfo(Crypter):
 
     def handleFolder(self, m):
         html = self.load("http://duckcrypt.info/ajax/auth.php?hash=" + str(m.group(2)))
-        m = re.match(self.__pattern, html)
+        m = re.match(self.__pattern__, html)
         self.logDebug("Redirectet to " + str(m.group(0)))
         html = self.load(str(m.group(0)))
         soup = BeautifulSoup(html)
diff --git a/pyload/plugin/crypter/DuploadOrg.py b/pyload/plugin/crypter/DuploadOrg.py
index d5839bce0..70745b550 100644
--- a/pyload/plugin/crypter/DuploadOrg.py
+++ b/pyload/plugin/crypter/DuploadOrg.py
@@ -4,16 +4,16 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class DuploadOrg(DeadCrypter):
-    __name    = "DuploadOrg"
-    __type    = "crypter"
-    __version = "0.02"
+    __name__    = "DuploadOrg"
+    __type__    = "crypter"
+    __version__ = "0.02"
 
-    __pattern = r'http://(?:www\.)?dupload\.org/folder/\d+'
-    __config  = []
+    __pattern__ = r'http://(?:www\.)?dupload\.org/folder/\d+'
+    __config__  = []
 
-    __description = """Dupload.org folder decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("stickell", "l.stickell@yahoo.it")]
+    __description__ = """Dupload.org folder decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
 getInfo = create_getInfo(DuploadOrg)
diff --git a/pyload/plugin/crypter/EasybytezCom.py b/pyload/plugin/crypter/EasybytezCom.py
index 2e7e37537..9a4fca74a 100644
--- a/pyload/plugin/crypter/EasybytezCom.py
+++ b/pyload/plugin/crypter/EasybytezCom.py
@@ -4,17 +4,17 @@ from pyload.plugin.internal.XFSCrypter import XFSCrypter
 
 
 class EasybytezCom(XFSCrypter):
-    __name    = "EasybytezCom"
-    __type    = "crypter"
-    __version = "0.10"
+    __name__    = "EasybytezCom"
+    __type__    = "crypter"
+    __version__ = "0.10"
 
-    __pattern = r'http://(?:www\.)?easybytez\.com/users/\d+/\d+'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?easybytez\.com/users/\d+/\d+'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Easybytez.com folder decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("stickell", "l.stickell@yahoo.it")]
+    __description__ = """Easybytez.com folder decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
     HOSTER_DOMAIN = "easybytez.com"
diff --git a/pyload/plugin/crypter/EmbeduploadCom.py b/pyload/plugin/crypter/EmbeduploadCom.py
index 88f6db50b..3265a939e 100644
--- a/pyload/plugin/crypter/EmbeduploadCom.py
+++ b/pyload/plugin/crypter/EmbeduploadCom.py
@@ -6,19 +6,19 @@ from pyload.network.HTTPRequest import BadHeader
 
 
 class EmbeduploadCom(Crypter):
-    __name    = "EmbeduploadCom"
-    __type    = "crypter"
-    __version = "0.02"
+    __name__    = "EmbeduploadCom"
+    __type__    = "crypter"
+    __version__ = "0.02"
 
-    __pattern = r'http://(?:www\.)?embedupload\.com/\?d=.*'
-    __config = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?embedupload\.com/\?d=.*'
+    __config__ = [("use_subfolder", "bool", "Save package to subfolder", True),
                 ("subfolder_per_package", "bool", "Create a subfolder for each package", True),
                 ("preferedHoster", "str", "Prefered hoster list (bar-separated)", "embedupload"),
                 ("ignoredHoster", "str", "Ignored hoster list (bar-separated)", "")]
 
-    __description = """EmbedUpload.com decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """EmbedUpload.com decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     LINK_PATTERN = r'<div id="([^"]+)"[^>]*>\s*<a href="([^"]+)" target="_blank" (?:class="DownloadNow"|style="color:red")>'
diff --git a/pyload/plugin/crypter/FilebeerInfo.py b/pyload/plugin/crypter/FilebeerInfo.py
index 294f57451..a6faa5cab 100644
--- a/pyload/plugin/crypter/FilebeerInfo.py
+++ b/pyload/plugin/crypter/FilebeerInfo.py
@@ -4,16 +4,16 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class FilebeerInfo(DeadCrypter):
-    __name    = "FilebeerInfo"
-    __type    = "crypter"
-    __version = "0.02"
+    __name__    = "FilebeerInfo"
+    __type__    = "crypter"
+    __version__ = "0.02"
 
-    __pattern = r'http://(?:www\.)?filebeer\.info/(\d+~f).*'
-    __config  = []
+    __pattern__ = r'http://(?:www\.)?filebeer\.info/(\d+~f).*'
+    __config__  = []
 
-    __description = """Filebeer.info folder decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """Filebeer.info folder decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
 getInfo = create_getInfo(FilebeerInfo)
diff --git a/pyload/plugin/crypter/FilecloudIo.py b/pyload/plugin/crypter/FilecloudIo.py
index 1926d04bb..f4c967a07 100644
--- a/pyload/plugin/crypter/FilecloudIo.py
+++ b/pyload/plugin/crypter/FilecloudIo.py
@@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class FilecloudIo(SimpleCrypter):
-    __name    = "FilecloudIo"
-    __type    = "crypter"
-    __version = "0.03"
+    __name__    = "FilecloudIo"
+    __type__    = "crypter"
+    __version__ = "0.03"
 
-    __pattern = r'https?://(?:www\.)?(filecloud\.io|ifile\.it)/_\w+'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'https?://(?:www\.)?(filecloud\.io|ifile\.it)/_\w+'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Filecloud.io folder decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description__ = """Filecloud.io folder decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     LINK_PATTERN = r'href="(http://filecloud\.io/\w+)" title'
diff --git a/pyload/plugin/crypter/FilecryptCc.py b/pyload/plugin/crypter/FilecryptCc.py
index 7db82f24c..475c1503f 100644
--- a/pyload/plugin/crypter/FilecryptCc.py
+++ b/pyload/plugin/crypter/FilecryptCc.py
@@ -10,15 +10,15 @@ from pyload.plugin.Crypter import Crypter
 
 
 class FilecryptCc(Crypter):
-    __name    = "FilecryptCc"
-    __type    = "crypter"
-    __version = "0.05"
+    __name__    = "FilecryptCc"
+    __type__    = "crypter"
+    __version__ = "0.05"
 
-    __pattern = r'https?://(?:www\.)?filecrypt\.cc/Container/\w+'
+    __pattern__ = r'https?://(?:www\.)?filecrypt\.cc/Container/\w+'
 
-    __description = """Filecrypt.cc decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zapp-brannigan", "fuerst.reinje@web.de")]
+    __description__ = """Filecrypt.cc decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")]
 
 
     # URL_REPLACEMENTS  = [(r'.html$', ""), (r'$', ".html")]  #@TODO: Extend SimpleCrypter
diff --git a/pyload/plugin/crypter/FilefactoryCom.py b/pyload/plugin/crypter/FilefactoryCom.py
index 5b2d242cb..bdfeec46f 100644
--- a/pyload/plugin/crypter/FilefactoryCom.py
+++ b/pyload/plugin/crypter/FilefactoryCom.py
@@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class FilefactoryCom(SimpleCrypter):
-    __name    = "FilefactoryCom"
-    __type    = "crypter"
-    __version = "0.31"
+    __name__    = "FilefactoryCom"
+    __type__    = "crypter"
+    __version__ = "0.31"
 
-    __pattern = r'https?://(?:www\.)?filefactory\.com/(?:f|folder)/\w+'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'https?://(?:www\.)?filefactory\.com/(?:f|folder)/\w+'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Filefactory.com folder decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("stickell", "l.stickell@yahoo.it")]
+    __description__ = """Filefactory.com folder decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
     LINK_PATTERN = r'<td><a href="([^"]+)">'
diff --git a/pyload/plugin/crypter/FilerNet.py b/pyload/plugin/crypter/FilerNet.py
index 950012b46..069698bf1 100644
--- a/pyload/plugin/crypter/FilerNet.py
+++ b/pyload/plugin/crypter/FilerNet.py
@@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class FilerNet(SimpleCrypter):
-    __name    = "FilerNet"
-    __type    = "crypter"
-    __version = "0.41"
+    __name__    = "FilerNet"
+    __type__    = "crypter"
+    __version__ = "0.41"
 
-    __pattern = r'https?://filer\.net/folder/\w{16}'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'https?://filer\.net/folder/\w{16}'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Filer.net decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("nath_schwarz", "nathan.notwhite@gmail.com"),
+    __description__ = """Filer.net decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("nath_schwarz", "nathan.notwhite@gmail.com"),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/pyload/plugin/crypter/FileserveCom.py b/pyload/plugin/crypter/FileserveCom.py
index a9f766b81..ab0665fbd 100644
--- a/pyload/plugin/crypter/FileserveCom.py
+++ b/pyload/plugin/crypter/FileserveCom.py
@@ -6,17 +6,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class FileserveCom(Crypter):
-    __name    = "FileserveCom"
-    __type    = "crypter"
-    __version = "0.11"
+    __name__    = "FileserveCom"
+    __type__    = "crypter"
+    __version__ = "0.11"
 
-    __pattern = r'http://(?:www\.)?fileserve\.com/list/\w+'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?fileserve\.com/list/\w+'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """FileServe.com folder decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("fionnc", "fionnc@gmail.com")]
+    __description__ = """FileServe.com folder decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("fionnc", "fionnc@gmail.com")]
 
 
     FOLDER_PATTERN = r'<table class="file_list">(.*?)</table>'
diff --git a/pyload/plugin/crypter/FilesonicCom.py b/pyload/plugin/crypter/FilesonicCom.py
index 6dded6c04..b1722c1bb 100644
--- a/pyload/plugin/crypter/FilesonicCom.py
+++ b/pyload/plugin/crypter/FilesonicCom.py
@@ -4,15 +4,15 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class FilesonicCom(DeadCrypter):
-    __name    = "FilesonicCom"
-    __type    = "crypter"
-    __version = "0.12"
+    __name__    = "FilesonicCom"
+    __type__    = "crypter"
+    __version__ = "0.12"
 
-    __pattern = r'http://(?:www\.)?filesonic\.com/folder/\w+'
+    __pattern__ = r'http://(?:www\.)?filesonic\.com/folder/\w+'
 
-    __description = """Filesonic.com folder decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """Filesonic.com folder decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
 getInfo = create_getInfo(FilesonicCom)
diff --git a/pyload/plugin/crypter/FilestubeCom.py b/pyload/plugin/crypter/FilestubeCom.py
index 5238899b0..36e4a4caf 100644
--- a/pyload/plugin/crypter/FilestubeCom.py
+++ b/pyload/plugin/crypter/FilestubeCom.py
@@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class FilestubeCom(SimpleCrypter):
-    __name    = "FilestubeCom"
-    __type    = "crypter"
-    __version = "0.05"
+    __name__    = "FilestubeCom"
+    __type__    = "crypter"
+    __version__ = "0.05"
 
-    __pattern = r'http://(?:www\.)?filestube\.(?:com|to)/\w+'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?filestube\.(?:com|to)/\w+'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Filestube.com decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("stickell", "l.stickell@yahoo.it")]
+    __description__ = """Filestube.com decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
     LINK_PATTERN = r'<a class=\"file-link-main(?: noref)?\" [^>]* href=\"(http://[^\"]+)'
diff --git a/pyload/plugin/crypter/FiletramCom.py b/pyload/plugin/crypter/FiletramCom.py
index 28e38e30e..700050a4b 100644
--- a/pyload/plugin/crypter/FiletramCom.py
+++ b/pyload/plugin/crypter/FiletramCom.py
@@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class FiletramCom(SimpleCrypter):
-    __name    = "FiletramCom"
-    __type    = "crypter"
-    __version = "0.03"
+    __name__    = "FiletramCom"
+    __type__    = "crypter"
+    __version__ = "0.03"
 
-    __pattern = r'http://(?:www\.)?filetram\.com/[^/]+/.+'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?filetram\.com/[^/]+/.+'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Filetram.com decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("igel", "igelkun@myopera.com"),
+    __description__ = """Filetram.com decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("igel", "igelkun@myopera.com"),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/pyload/plugin/crypter/FiredriveCom.py b/pyload/plugin/crypter/FiredriveCom.py
index 27b81c006..bf315ad16 100644
--- a/pyload/plugin/crypter/FiredriveCom.py
+++ b/pyload/plugin/crypter/FiredriveCom.py
@@ -4,16 +4,16 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class FiredriveCom(DeadCrypter):
-    __name    = "FiredriveCom"
-    __type    = "crypter"
-    __version = "0.03"
+    __name__    = "FiredriveCom"
+    __type__    = "crypter"
+    __version__ = "0.03"
 
-    __pattern = r'https?://(?:www\.)?(firedrive|putlocker)\.com/share/.+'
-    __config  = []
+    __pattern__ = r'https?://(?:www\.)?(firedrive|putlocker)\.com/share/.+'
+    __config__  = []
 
-    __description = """Firedrive.com folder decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description__ = """Firedrive.com folder decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
 getInfo = create_getInfo(FiredriveCom)
diff --git a/pyload/plugin/crypter/FourChanOrg.py b/pyload/plugin/crypter/FourChanOrg.py
index 97d21ddeb..e5f6cc0cf 100644
--- a/pyload/plugin/crypter/FourChanOrg.py
+++ b/pyload/plugin/crypter/FourChanOrg.py
@@ -8,17 +8,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class FourChanOrg(Crypter):
-    __name    = "FourChanOrg"
-    __type    = "crypter"
-    __version = "0.30"
+    __name__    = "FourChanOrg"
+    __type__    = "crypter"
+    __version__ = "0.30"
 
-    __pattern = r'http://(?:www\.)?boards\.4chan\.org/\w+/res/(\d+)'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?boards\.4chan\.org/\w+/res/(\d+)'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """4chan.org folder decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = []
+    __description__ = """4chan.org folder decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = []
 
 
     def decrypt(self, pyfile):
diff --git a/pyload/plugin/crypter/FreakhareCom.py b/pyload/plugin/crypter/FreakhareCom.py
index 9df8ef200..cb766361c 100644
--- a/pyload/plugin/crypter/FreakhareCom.py
+++ b/pyload/plugin/crypter/FreakhareCom.py
@@ -6,17 +6,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class FreakhareCom(SimpleCrypter):
-    __name    = "FreakhareCom"
-    __type    = "crypter"
-    __version = "0.03"
+    __name__    = "FreakhareCom"
+    __type__    = "crypter"
+    __version__ = "0.03"
 
-    __pattern = r'http://(?:www\.)?freakshare\.com/folder/.+'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?freakshare\.com/folder/.+'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Freakhare.com folder decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("stickell", "l.stickell@yahoo.it")]
+    __description__ = """Freakhare.com folder decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
     LINK_PATTERN = r'<a href="(http://freakshare\.com/files/[^"]+)" target="_blank">'
diff --git a/pyload/plugin/crypter/FreetexthostCom.py b/pyload/plugin/crypter/FreetexthostCom.py
index db97a8003..3b082ef7d 100644
--- a/pyload/plugin/crypter/FreetexthostCom.py
+++ b/pyload/plugin/crypter/FreetexthostCom.py
@@ -6,17 +6,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class FreetexthostCom(SimpleCrypter):
-    __name    = "FreetexthostCom"
-    __type    = "crypter"
-    __version = "0.01"
+    __name__    = "FreetexthostCom"
+    __type__    = "crypter"
+    __version__ = "0.01"
 
-    __pattern = r'http://(?:www\.)?freetexthost\.com/\w+'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?freetexthost\.com/\w+'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Freetexthost.com decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("stickell", "l.stickell@yahoo.it")]
+    __description__ = """Freetexthost.com decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
     def getLinks(self):
diff --git a/pyload/plugin/crypter/FshareVn.py b/pyload/plugin/crypter/FshareVn.py
index 895a4d258..9b552a957 100644
--- a/pyload/plugin/crypter/FshareVn.py
+++ b/pyload/plugin/crypter/FshareVn.py
@@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class FshareVn(SimpleCrypter):
-    __name    = "FshareVn"
-    __type    = "crypter"
-    __version = "0.01"
+    __name__    = "FshareVn"
+    __type__    = "crypter"
+    __version__ = "0.01"
 
-    __pattern = r'http://(?:www\.)?fshare\.vn/folder/.*'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?fshare\.vn/folder/.*'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Fshare.vn folder decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """Fshare.vn folder decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     LINK_PATTERN = r'<li class="w_80pc"><a href="([^"]+)" target="_blank">'
diff --git a/pyload/plugin/crypter/Go4UpCom.py b/pyload/plugin/crypter/Go4UpCom.py
index 8652c3825..ffd945737 100644
--- a/pyload/plugin/crypter/Go4UpCom.py
+++ b/pyload/plugin/crypter/Go4UpCom.py
@@ -8,15 +8,15 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 
 
 class Go4UpCom(SimpleCrypter):
-    __name    = "Go4UpCom"
-    __type    = "crypter"
-    __version = "0.11"
+    __name__    = "Go4UpCom"
+    __type__    = "crypter"
+    __version__ = "0.11"
 
-    __pattern = r'http://go4up\.com/(dl/\w{12}|rd/\w{12}/\d+)'
+    __pattern__ = r'http://go4up\.com/(dl/\w{12}|rd/\w{12}/\d+)'
 
-    __description = """Go4Up.com decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("rlindner81", "rlindner81@gmail.com"),
+    __description__ = """Go4Up.com decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("rlindner81", "rlindner81@gmail.com"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/pyload/plugin/crypter/GooGl.py b/pyload/plugin/crypter/GooGl.py
index d1c47935d..13ffce505 100644
--- a/pyload/plugin/crypter/GooGl.py
+++ b/pyload/plugin/crypter/GooGl.py
@@ -5,17 +5,17 @@ from pyload.utils import json_loads
 
 
 class GooGl(Crypter):
-    __name    = "GooGl"
-    __type    = "crypter"
-    __version = "0.01"
+    __name__    = "GooGl"
+    __type__    = "crypter"
+    __version__ = "0.01"
 
-    __pattern = r'https?://(?:www\.)?goo\.gl/\w+'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'https?://(?:www\.)?goo\.gl/\w+'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Goo.gl decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("stickell", "l.stickell@yahoo.it")]
+    __description__ = """Goo.gl decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
     API_URL = "https://www.googleapis.com/urlshortener/v1/url"
diff --git a/pyload/plugin/crypter/HoerbuchIn.py b/pyload/plugin/crypter/HoerbuchIn.py
index a809e756c..a12d7c02a 100644
--- a/pyload/plugin/crypter/HoerbuchIn.py
+++ b/pyload/plugin/crypter/HoerbuchIn.py
@@ -8,17 +8,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class HoerbuchIn(Crypter):
-    __name    = "HoerbuchIn"
-    __type    = "crypter"
-    __version = "0.60"
+    __name__    = "HoerbuchIn"
+    __type__    = "crypter"
+    __version__ = "0.60"
 
-    __pattern = r'http://(?:www\.)?hoerbuch\.in/(wp/horbucher/\d+/.+/|tp/out\.php\?.+|protection/folder_\d+\.html)'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?hoerbuch\.in/(wp/horbucher/\d+/.+/|tp/out\.php\?.+|protection/folder_\d+\.html)'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Hoerbuch.in decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("spoob", "spoob@pyload.org"),
+    __description__ = """Hoerbuch.in decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("spoob", "spoob@pyload.org"),
                        ("mkaay", "mkaay@mkaay.de")]
 
 
diff --git a/pyload/plugin/crypter/HotfileCom.py b/pyload/plugin/crypter/HotfileCom.py
index 11e0008c5..72eec8f93 100644
--- a/pyload/plugin/crypter/HotfileCom.py
+++ b/pyload/plugin/crypter/HotfileCom.py
@@ -4,16 +4,16 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class HotfileCom(DeadCrypter):
-    __name    = "HotfileCom"
-    __type    = "crypter"
-    __version = "0.30"
+    __name__    = "HotfileCom"
+    __type__    = "crypter"
+    __version__ = "0.30"
 
-    __pattern = r'https?://(?:www\.)?hotfile\.com/list/\w+/\w+'
-    __config  = []
+    __pattern__ = r'https?://(?:www\.)?hotfile\.com/list/\w+/\w+'
+    __config__  = []
 
-    __description = """Hotfile.com folder decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("RaNaN", "RaNaN@pyload.org")]
+    __description__ = """Hotfile.com folder decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("RaNaN", "RaNaN@pyload.org")]
 
 
 getInfo = create_getInfo(HotfileCom)
diff --git a/pyload/plugin/crypter/ILoadTo.py b/pyload/plugin/crypter/ILoadTo.py
index d012c9bfd..d3e50630c 100644
--- a/pyload/plugin/crypter/ILoadTo.py
+++ b/pyload/plugin/crypter/ILoadTo.py
@@ -4,16 +4,16 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class ILoadTo(DeadCrypter):
-    __name    = "ILoadTo"
-    __type    = "crypter"
-    __version = "0.11"
+    __name__    = "ILoadTo"
+    __type__    = "crypter"
+    __version__ = "0.11"
 
-    __pattern = r'http://(?:www\.)?iload\.to/go/\d+-[\w.-]+/'
-    __config  = []
+    __pattern__ = r'http://(?:www\.)?iload\.to/go/\d+-[\w.-]+/'
+    __config__  = []
 
-    __description = """Iload.to decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("hzpz", "")]
+    __description__ = """Iload.to decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("hzpz", "")]
 
 
 getInfo = create_getInfo(ILoadTo)
diff --git a/pyload/plugin/crypter/ImgurComAlbum.py b/pyload/plugin/crypter/ImgurComAlbum.py
index e7df57cb6..d2ca38d40 100644
--- a/pyload/plugin/crypter/ImgurComAlbum.py
+++ b/pyload/plugin/crypter/ImgurComAlbum.py
@@ -5,17 +5,17 @@ from pyload.utils import uniqify
 
 
 class ImgurComAlbum(SimpleCrypter):
-    __name    = "ImgurComAlbum"
-    __type    = "crypter"
-    __version = "0.51"
+    __name__    = "ImgurComAlbum"
+    __type__    = "crypter"
+    __version__ = "0.51"
 
-    __pattern = r'https?://(?:www\.|m\.)?imgur\.com/(a|gallery|)/?\w{5,7}'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'https?://(?:www\.|m\.)?imgur\.com/(a|gallery|)/?\w{5,7}'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Imgur.com decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("nath_schwarz", "nathan.notwhite@gmail.com")]
+    __description__ = """Imgur.com decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("nath_schwarz", "nathan.notwhite@gmail.com")]
 
 
     NAME_PATTERN = r'(?P<N>.+?) - Imgur'
diff --git a/pyload/plugin/crypter/JunocloudMe.py b/pyload/plugin/crypter/JunocloudMe.py
index b47a5fc58..97b3c7e39 100644
--- a/pyload/plugin/crypter/JunocloudMe.py
+++ b/pyload/plugin/crypter/JunocloudMe.py
@@ -4,17 +4,17 @@ from pyload.plugin.internal.XFSCrypter import XFSCrypter
 
 
 class JunocloudMe(XFSCrypter):
-    __name    = "JunocloudMe"
-    __type    = "crypter"
-    __version = "0.03"
+    __name__    = "JunocloudMe"
+    __type__    = "crypter"
+    __version__ = "0.03"
 
-    __pattern = r'http://(?:www\.)?junocloud\.me/folders/(?P<ID>\d+/\w+)'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?junocloud\.me/folders/(?P<ID>\d+/\w+)'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Junocloud.me folder decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("guidobelix", "guidobelix@hotmail.it")]
+    __description__ = """Junocloud.me folder decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("guidobelix", "guidobelix@hotmail.it")]
 
 
     HOSTER_DOMAIN = "junocloud.me"
diff --git a/pyload/plugin/crypter/LetitbitNet.py b/pyload/plugin/crypter/LetitbitNet.py
index ca787e31a..24bc196b3 100644
--- a/pyload/plugin/crypter/LetitbitNet.py
+++ b/pyload/plugin/crypter/LetitbitNet.py
@@ -5,17 +5,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class LetitbitNet(Crypter):
-    __name    = "LetitbitNet"
-    __type    = "crypter"
-    __version = "0.10"
+    __name__    = "LetitbitNet"
+    __type__    = "crypter"
+    __version__ = "0.10"
 
-    __pattern = r'http://(?:www\.)?letitbit\.net/folder/\w+'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?letitbit\.net/folder/\w+'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Letitbit.net folder decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("DHMH", "webmaster@pcProfil.de"),
+    __description__ = """Letitbit.net folder decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("DHMH", "webmaster@pcProfil.de"),
                        ("z00nx", "z00nx0@gmail.com")]
 
 
diff --git a/pyload/plugin/crypter/LinkCryptWs.py b/pyload/plugin/crypter/LinkCryptWs.py
index 2bd7b4c17..1173d84cd 100644
--- a/pyload/plugin/crypter/LinkCryptWs.py
+++ b/pyload/plugin/crypter/LinkCryptWs.py
@@ -13,15 +13,15 @@ from pyload.utils import html_unescape
 
 
 class LinkCryptWs(Crypter):
-    __name    = "LinkCryptWs"
-    __type    = "crypter"
-    __version = "0.07"
+    __name__    = "LinkCryptWs"
+    __type__    = "crypter"
+    __version__ = "0.07"
 
-    __pattern = r'http://(?:www\.)?linkcrypt\.ws/(dir|container)/(?P<ID>\w+)'
+    __pattern__ = r'http://(?:www\.)?linkcrypt\.ws/(dir|container)/(?P<ID>\w+)'
 
-    __description = """LinkCrypt.ws decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("kagenoshin", "kagenoshin[AT]gmx[DOT]ch"),
+    __description__ = """LinkCrypt.ws decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("kagenoshin", "kagenoshin[AT]gmx[DOT]ch"),
                        ("glukgluk", ""),
                        ("Gummibaer", "")]
 
@@ -38,7 +38,7 @@ class LinkCryptWs(Crypter):
 
     def prepare(self):
         # Init
-        self.fileid = re.match(self.__pattern, self.pyfile.url).group('ID')
+        self.fileid = re.match(self.__pattern__, self.pyfile.url).group('ID')
 
         self.req.cj.setCookie("linkcrypt.ws", "language", "en")
 
diff --git a/pyload/plugin/crypter/LinkSaveIn.py b/pyload/plugin/crypter/LinkSaveIn.py
index 3d5a989eb..9b4af05f2 100644
--- a/pyload/plugin/crypter/LinkSaveIn.py
+++ b/pyload/plugin/crypter/LinkSaveIn.py
@@ -14,17 +14,17 @@ from pyload.utils import html_unescape
 
 
 class LinkSaveIn(SimpleCrypter):
-    __name    = "LinkSaveIn"
-    __type    = "crypter"
-    __version = "2.02"
+    __name__    = "LinkSaveIn"
+    __type__    = "crypter"
+    __version__ = "2.02"
 
-    __pattern = r'http://(?:www\.)?linksave\.in/(?P<id>\w+)$'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?linksave\.in/(?P<id>\w+)$'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """LinkSave.in decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("fragonib", "fragonib[AT]yahoo[DOT]es")]
+    __description__ = """LinkSave.in decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("fragonib", "fragonib[AT]yahoo[DOT]es")]
 
 
     COOKIES = [("linksave.in", "Linksave_Language", "english")]
@@ -44,7 +44,7 @@ class LinkSaveIn(SimpleCrypter):
     def decrypt(self, pyfile):
         # Init
         self.package = pyfile.package()
-        self.fileid = re.match(self.__pattern, pyfile.url).group('id')
+        self.fileid = re.match(self.__pattern__, pyfile.url).group('id')
 
         # Request package
         self.html = self.load(pyfile.url)
diff --git a/pyload/plugin/crypter/LinkdecrypterCom.py b/pyload/plugin/crypter/LinkdecrypterCom.py
index 349e8b2d3..ab9bdbdc7 100644
--- a/pyload/plugin/crypter/LinkdecrypterCom.py
+++ b/pyload/plugin/crypter/LinkdecrypterCom.py
@@ -5,17 +5,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class LinkdecrypterCom(Crypter):
-    __name    = "LinkdecrypterCom"
-    __type    = "crypter"
-    __version = "0.27"
+    __name__    = "LinkdecrypterCom"
+    __type__    = "crypter"
+    __version__ = "0.27"
 
-    __pattern = r'^unmatchable$'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'^unmatchable$'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Linkdecrypter.com"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz"),
+    __description__ = """Linkdecrypter.com"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
                        ("flowlee", "")]
 
 
diff --git a/pyload/plugin/crypter/LixIn.py b/pyload/plugin/crypter/LixIn.py
index f992d38fd..0b4329d35 100644
--- a/pyload/plugin/crypter/LixIn.py
+++ b/pyload/plugin/crypter/LixIn.py
@@ -6,17 +6,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class LixIn(Crypter):
-    __name    = "LixIn"
-    __type    = "crypter"
-    __version = "0.22"
+    __name__    = "LixIn"
+    __type__    = "crypter"
+    __version__ = "0.22"
 
-    __pattern = r'http://(?:www\.)?lix\.in/(?P<ID>.+)'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?lix\.in/(?P<ID>.+)'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Lix.in decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("spoob", "spoob@pyload.org")]
+    __description__ = """Lix.in decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("spoob", "spoob@pyload.org")]
 
 
     CAPTCHA_PATTERN = r'<img src="(?P<image>captcha_img\.php\?.*?)"'
@@ -27,7 +27,7 @@ class LixIn(Crypter):
     def decrypt(self, pyfile):
         url = pyfile.url
 
-        m = re.match(self.__pattern, url)
+        m = re.match(self.__pattern__, url)
         if m is None:
             self.error(_("Unable to identify file ID"))
 
diff --git a/pyload/plugin/crypter/LofCc.py b/pyload/plugin/crypter/LofCc.py
index f1f4d1680..05917b522 100644
--- a/pyload/plugin/crypter/LofCc.py
+++ b/pyload/plugin/crypter/LofCc.py
@@ -4,16 +4,16 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class LofCc(DeadCrypter):
-    __name    = "LofCc"
-    __type    = "crypter"
-    __version = "0.21"
+    __name__    = "LofCc"
+    __type__    = "crypter"
+    __version__ = "0.21"
 
-    __pattern = r'http://(?:www\.)?lof\.cc/(.*)'
-    __config  = []
+    __pattern__ = r'http://(?:www\.)?lof\.cc/(.*)'
+    __config__  = []
 
-    __description = """Lof.cc decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("mkaay", "mkaay@mkaay.de")]
+    __description__ = """Lof.cc decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("mkaay", "mkaay@mkaay.de")]
 
 
 getInfo = create_getInfo(LofCc)
diff --git a/pyload/plugin/crypter/MBLinkInfo.py b/pyload/plugin/crypter/MBLinkInfo.py
index 64eb57167..7f1561756 100644
--- a/pyload/plugin/crypter/MBLinkInfo.py
+++ b/pyload/plugin/crypter/MBLinkInfo.py
@@ -4,16 +4,16 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class MBLinkInfo(DeadCrypter):
-    __name    = "MBLinkInfo"
-    __type    = "crypter"
-    __version = "0.03"
+    __name__    = "MBLinkInfo"
+    __type__    = "crypter"
+    __version__ = "0.03"
 
-    __pattern = r'http://(?:www\.)?mblink\.info/?\?id=(\d+)'
-    __config  = []
+    __pattern__ = r'http://(?:www\.)?mblink\.info/?\?id=(\d+)'
+    __config__  = []
 
-    __description = """MBLink.info decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("Gummibaer", "Gummibaer@wiki-bierkiste.de"),
+    __description__ = """MBLink.info decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Gummibaer", "Gummibaer@wiki-bierkiste.de"),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
diff --git a/pyload/plugin/crypter/MediafireCom.py b/pyload/plugin/crypter/MediafireCom.py
index 036c41233..a7360a6db 100644
--- a/pyload/plugin/crypter/MediafireCom.py
+++ b/pyload/plugin/crypter/MediafireCom.py
@@ -7,17 +7,17 @@ from pyload.utils import json_loads
 
 
 class MediafireCom(Crypter):
-    __name    = "MediafireCom"
-    __type    = "crypter"
-    __version = "0.14"
+    __name__    = "MediafireCom"
+    __type__    = "crypter"
+    __version__ = "0.14"
 
-    __pattern = r'http://(?:www\.)?mediafire\.com/(folder/|\?sharekey=|\?\w{13}($|[/#]))'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?mediafire\.com/(folder/|\?sharekey=|\?\w{13}($|[/#]))'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Mediafire.com folder decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """Mediafire.com folder decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     FOLDER_KEY_PATTERN = r'var afI= \'(\w+)'
diff --git a/pyload/plugin/crypter/MegaRapidCz.py b/pyload/plugin/crypter/MegaRapidCz.py
index 2cedfec09..79900c08a 100644
--- a/pyload/plugin/crypter/MegaRapidCz.py
+++ b/pyload/plugin/crypter/MegaRapidCz.py
@@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class MegaRapidCz(SimpleCrypter):
-    __name    = "MegaRapidCz"
-    __type    = "crypter"
-    __version = "0.02"
+    __name__    = "MegaRapidCz"
+    __type__    = "crypter"
+    __version__ = "0.02"
 
-    __pattern = r'http://(?:www\.)?(share|mega)rapid\.cz/slozka/\d+/\w+'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?(share|mega)rapid\.cz/slozka/\d+/\w+'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Share-Rapid.com folder decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """Share-Rapid.com folder decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     LINK_PATTERN = r'<td class="soubor"[^>]*><a href="([^"]+)">'
diff --git a/pyload/plugin/crypter/MegauploadCom.py b/pyload/plugin/crypter/MegauploadCom.py
index 5a4b2349e..6981cebc8 100644
--- a/pyload/plugin/crypter/MegauploadCom.py
+++ b/pyload/plugin/crypter/MegauploadCom.py
@@ -4,15 +4,15 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class MegauploadCom(DeadCrypter):
-    __name    = "MegauploadCom"
-    __type    = "crypter"
-    __version = "0.02"
+    __name__    = "MegauploadCom"
+    __type__    = "crypter"
+    __version__ = "0.02"
 
-    __pattern = r'http://(?:www\.)?megaupload\.com/(\?f|xml/folderfiles\.php\?.*&?folderid)=\w+'
+    __pattern__ = r'http://(?:www\.)?megaupload\.com/(\?f|xml/folderfiles\.php\?.*&?folderid)=\w+'
 
-    __description = """Megaupload.com folder decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """Megaupload.com folder decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
 getInfo = create_getInfo(MegauploadCom)
diff --git a/pyload/plugin/crypter/Movie2kTo.py b/pyload/plugin/crypter/Movie2kTo.py
index b481ead73..16a9850d9 100644
--- a/pyload/plugin/crypter/Movie2kTo.py
+++ b/pyload/plugin/crypter/Movie2kTo.py
@@ -4,16 +4,16 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class Movie2kTo(DeadCrypter):
-    __name    = "Movie2kTo"
-    __type    = "crypter"
-    __version = "0.51"
+    __name__    = "Movie2kTo"
+    __type__    = "crypter"
+    __version__ = "0.51"
 
-    __pattern = r'http://(?:www\.)?movie2k\.to/(.*)\.html'
-    __config  = []
+    __pattern__ = r'http://(?:www\.)?movie2k\.to/(.*)\.html'
+    __config__  = []
 
-    __description = """Movie2k.to decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("4Christopher", "4Christopher@gmx.de")]
+    __description__ = """Movie2k.to decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("4Christopher", "4Christopher@gmx.de")]
 
 
 getInfo = create_getInfo(Movie2kTo)
diff --git a/pyload/plugin/crypter/MultiUpOrg.py b/pyload/plugin/crypter/MultiUpOrg.py
index 1b3116ad5..9ecbf6d53 100644
--- a/pyload/plugin/crypter/MultiUpOrg.py
+++ b/pyload/plugin/crypter/MultiUpOrg.py
@@ -7,24 +7,24 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class MultiUpOrg(SimpleCrypter):
-    __name    = "MultiUpOrg"
-    __type    = "crypter"
-    __version = "0.03"
+    __name__    = "MultiUpOrg"
+    __type__    = "crypter"
+    __version__ = "0.03"
 
-    __pattern = r'http://(?:www\.)?multiup\.org/(en|fr)/(?P<TYPE>project|download|miror)/\w+(/\w+)?'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?multiup\.org/(en|fr)/(?P<TYPE>project|download|miror)/\w+(/\w+)?'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """MultiUp.org decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description__ = """MultiUp.org decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     NAME_PATTERN = r'<title>.*(?:Project|Projet|ownload|élécharger) (?P<N>.+?) (\(|- )'
 
 
     def getLinks(self):
-        m_type = re.match(self.__pattern, self.pyfile.url).group("TYPE")
+        m_type = re.match(self.__pattern__, self.pyfile.url).group("TYPE")
 
         if m_type == "project":
             pattern = r'\n(http://www\.multiup\.org/(?:en|fr)/download/.*)'
diff --git a/pyload/plugin/crypter/MultiloadCz.py b/pyload/plugin/crypter/MultiloadCz.py
index a94c53d42..4229caa6e 100644
--- a/pyload/plugin/crypter/MultiloadCz.py
+++ b/pyload/plugin/crypter/MultiloadCz.py
@@ -5,19 +5,19 @@ from pyload.plugin.Crypter import Crypter
 
 
 class MultiloadCz(Crypter):
-    __name    = "MultiloadCz"
-    __type    = "crypter"
-    __version = "0.40"
+    __name__    = "MultiloadCz"
+    __type__    = "crypter"
+    __version__ = "0.40"
 
-    __pattern = r'http://(?:[^/]*\.)?multiload\.cz/(stahnout|slozka)/.*'
-    __config = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:[^/]*\.)?multiload\.cz/(stahnout|slozka)/.*'
+    __config__ = [("use_subfolder", "bool", "Save package to subfolder", True),
                 ("subfolder_per_package", "bool", "Create a subfolder for each package", True),
                 ("usedHoster", "str", "Prefered hoster list (bar-separated)", ""),
                 ("ignoredHoster", "str", "Ignored hoster list (bar-separated)", "")]
 
-    __description = """Multiload.cz decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """Multiload.cz decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     FOLDER_PATTERN = r'<form action="" method="get"><textarea[^>]*>([^>]*)</textarea></form>'
@@ -27,7 +27,7 @@ class MultiloadCz(Crypter):
     def decrypt(self, pyfile):
         self.html = self.load(pyfile.url, decode=True)
 
-        if re.match(self.__pattern, pyfile.url).group(1) == "slozka":
+        if re.match(self.__pattern__, pyfile.url).group(1) == "slozka":
             m = re.search(self.FOLDER_PATTERN, self.html)
             if m:
                 self.urls.extend(m.group(1).split())
diff --git a/pyload/plugin/crypter/MultiuploadCom.py b/pyload/plugin/crypter/MultiuploadCom.py
index 44c449d72..98708bd95 100644
--- a/pyload/plugin/crypter/MultiuploadCom.py
+++ b/pyload/plugin/crypter/MultiuploadCom.py
@@ -4,15 +4,15 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class MultiuploadCom(DeadCrypter):
-    __name    = "MultiuploadCom"
-    __type    = "crypter"
-    __version = "0.02"
+    __name__    = "MultiuploadCom"
+    __type__    = "crypter"
+    __version__ = "0.02"
 
-    __pattern = r'http://(?:www\.)?multiupload\.(com|nl)/\w+'
+    __pattern__ = r'http://(?:www\.)?multiupload\.(com|nl)/\w+'
 
-    __description = """MultiUpload.com decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """MultiUpload.com decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
 getInfo = create_getInfo(MultiuploadCom)
diff --git a/pyload/plugin/crypter/NCryptIn.py b/pyload/plugin/crypter/NCryptIn.py
index 22d8020f2..415e2785a 100644
--- a/pyload/plugin/crypter/NCryptIn.py
+++ b/pyload/plugin/crypter/NCryptIn.py
@@ -11,17 +11,17 @@ from pyload.plugin.internal.captcha import ReCaptcha
 
 
 class NCryptIn(Crypter):
-    __name    = "NCryptIn"
-    __type    = "crypter"
-    __version = "1.33"
+    __name__    = "NCryptIn"
+    __type__    = "crypter"
+    __version__ = "1.33"
 
-    __pattern = r'http://(?:www\.)?ncrypt\.in/(?P<type>folder|link|frame)-([^/\?]+)'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?ncrypt\.in/(?P<type>folder|link|frame)-([^/\?]+)'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """NCrypt.in decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("fragonib", "fragonib[AT]yahoo[DOT]es"),
+    __description__ = """NCrypt.in decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("fragonib", "fragonib[AT]yahoo[DOT]es"),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
@@ -80,7 +80,7 @@ class NCryptIn(Crypter):
 
 
     def isSingleLink(self):
-        link_type = re.match(self.__pattern, self.pyfile.url).group('type')
+        link_type = re.match(self.__pattern__, self.pyfile.url).group('type')
         return link_type in ("link", "frame")
 
 
diff --git a/pyload/plugin/crypter/NetfolderIn.py b/pyload/plugin/crypter/NetfolderIn.py
index 279c99d94..876b2093f 100644
--- a/pyload/plugin/crypter/NetfolderIn.py
+++ b/pyload/plugin/crypter/NetfolderIn.py
@@ -6,17 +6,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class NetfolderIn(SimpleCrypter):
-    __name    = "NetfolderIn"
-    __type    = "crypter"
-    __version = "0.72"
+    __name__    = "NetfolderIn"
+    __type__    = "crypter"
+    __version__ = "0.72"
 
-    __pattern = r'http://(?:www\.)?netfolder\.in/((?P<id1>\w+)/\w+|folder\.php\?folder_id=(?P<id2>\w+))'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?netfolder\.in/((?P<id1>\w+)/\w+|folder\.php\?folder_id=(?P<id2>\w+))'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """NetFolder.in decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("RaNaN", "RaNaN@pyload.org"),
+    __description__ = """NetFolder.in decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("RaNaN", "RaNaN@pyload.org"),
                        ("fragonib", "fragonib[AT]yahoo[DOT]es")]
 
 
@@ -43,7 +43,7 @@ class NetfolderIn(SimpleCrypter):
     def submitPassword(self):
         # Gather data
         try:
-            m = re.match(self.__pattern, self.pyfile.url)
+            m = re.match(self.__pattern__, self.pyfile.url)
             id = max(m.group('id1'), m.group('id2'))
         except AttributeError:
             self.logDebug("Unable to get package id from url [%s]" % self.pyfile.url)
diff --git a/pyload/plugin/crypter/NosvideoCom.py b/pyload/plugin/crypter/NosvideoCom.py
index a9f29cf74..d048ec956 100644
--- a/pyload/plugin/crypter/NosvideoCom.py
+++ b/pyload/plugin/crypter/NosvideoCom.py
@@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class NosvideoCom(SimpleCrypter):
-    __name    = "NosvideoCom"
-    __type    = "crypter"
-    __version = "0.03"
+    __name__    = "NosvideoCom"
+    __type__    = "crypter"
+    __version__ = "0.03"
 
-    __pattern = r'http://(?:www\.)?nosvideo\.com/\?v=\w+'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?nosvideo\.com/\?v=\w+'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Nosvideo.com decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("igel", "igelkun@myopera.com")]
+    __description__ = """Nosvideo.com decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("igel", "igelkun@myopera.com")]
 
 
     LINK_PATTERN = r'href="(http://(?:w{3}\.)?nosupload\.com/\?d=\w+)"'
diff --git a/pyload/plugin/crypter/OneKhDe.py b/pyload/plugin/crypter/OneKhDe.py
index c3e5a6a3b..aad7901aa 100644
--- a/pyload/plugin/crypter/OneKhDe.py
+++ b/pyload/plugin/crypter/OneKhDe.py
@@ -7,17 +7,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class OneKhDe(Crypter):
-    __name    = "OneKhDe"
-    __type    = "crypter"
-    __version = "0.10"
+    __name__    = "OneKhDe"
+    __type__    = "crypter"
+    __version__ = "0.10"
 
-    __pattern = r'http://(?:www\.)?1kh\.de/f/'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?1kh\.de/f/'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """1kh.de decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("spoob", "spoob@pyload.org")]
+    __description__ = """1kh.de decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("spoob", "spoob@pyload.org")]
 
 
     def __init__(self, parent):
diff --git a/pyload/plugin/crypter/OronCom.py b/pyload/plugin/crypter/OronCom.py
index 24c941f19..42483c497 100644
--- a/pyload/plugin/crypter/OronCom.py
+++ b/pyload/plugin/crypter/OronCom.py
@@ -4,16 +4,16 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class OronCom(DeadCrypter):
-    __name    = "OronCom"
-    __type    = "crypter"
-    __version = "0.11"
+    __name__    = "OronCom"
+    __type__    = "crypter"
+    __version__ = "0.11"
 
-    __pattern = r'http://(?:www\.)?oron\.com/folder/\w+'
-    __config  = []
+    __pattern__ = r'http://(?:www\.)?oron\.com/folder/\w+'
+    __config__  = []
 
-    __description = """Oron.com folder decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("DHMH", "webmaster@pcProfil.de")]
+    __description__ = """Oron.com folder decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("DHMH", "webmaster@pcProfil.de")]
 
 
 getInfo = create_getInfo(OronCom)
diff --git a/pyload/plugin/crypter/PastebinCom.py b/pyload/plugin/crypter/PastebinCom.py
index 95c925733..43a818cf1 100644
--- a/pyload/plugin/crypter/PastebinCom.py
+++ b/pyload/plugin/crypter/PastebinCom.py
@@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class PastebinCom(SimpleCrypter):
-    __name    = "PastebinCom"
-    __type    = "crypter"
-    __version = "0.03"
+    __name__    = "PastebinCom"
+    __type__    = "crypter"
+    __version__ = "0.03"
 
-    __pattern = r'http://(?:www\.)?pastebin\.com/\w+'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?pastebin\.com/\w+'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Pastebin.com decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("stickell", "l.stickell@yahoo.it")]
+    __description__ = """Pastebin.com decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
     LINK_PATTERN = r'<div class="de\d+">(https?://[^ <]+)(?:[^<]*)</div>'
diff --git a/pyload/plugin/crypter/QuickshareCz.py b/pyload/plugin/crypter/QuickshareCz.py
index 5bb68c960..05a85a29c 100644
--- a/pyload/plugin/crypter/QuickshareCz.py
+++ b/pyload/plugin/crypter/QuickshareCz.py
@@ -5,17 +5,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class QuickshareCz(Crypter):
-    __name    = "QuickshareCz"
-    __type    = "crypter"
-    __version = "0.10"
+    __name__    = "QuickshareCz"
+    __type__    = "crypter"
+    __version__ = "0.10"
 
-    __pattern = r'http://(?:www\.)?quickshare\.cz/slozka-\d+.*'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?quickshare\.cz/slozka-\d+.*'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Quickshare.cz folder decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """Quickshare.cz folder decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     FOLDER_PATTERN = r'<textarea[^>]*>(.*?)</textarea>'
diff --git a/pyload/plugin/crypter/RSLayerCom.py b/pyload/plugin/crypter/RSLayerCom.py
index 934b3cac8..ebd3c509c 100644
--- a/pyload/plugin/crypter/RSLayerCom.py
+++ b/pyload/plugin/crypter/RSLayerCom.py
@@ -4,16 +4,16 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class RSLayerCom(DeadCrypter):
-    __name    = "RSLayerCom"
-    __type    = "crypter"
-    __version = "0.21"
+    __name__    = "RSLayerCom"
+    __type__    = "crypter"
+    __version__ = "0.21"
 
-    __pattern = r'http://(?:www\.)?rs-layer\.com/directory-'
-    __config  = []
+    __pattern__ = r'http://(?:www\.)?rs-layer\.com/directory-'
+    __config__  = []
 
-    __description = """RS-Layer.com decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("hzpz", "")]
+    __description__ = """RS-Layer.com decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("hzpz", "")]
 
 
 getInfo = create_getInfo(RSLayerCom)
diff --git a/pyload/plugin/crypter/RapidfileshareNet.py b/pyload/plugin/crypter/RapidfileshareNet.py
index 7003f017e..1d149dae9 100644
--- a/pyload/plugin/crypter/RapidfileshareNet.py
+++ b/pyload/plugin/crypter/RapidfileshareNet.py
@@ -4,17 +4,17 @@ from pyload.plugin.internal.XFSCrypter import XFSCrypter
 
 
 class RapidfileshareNet(XFSCrypter):
-    __name    = "RapidfileshareNet"
-    __type    = "crypter"
-    __version = "0.03"
+    __name__    = "RapidfileshareNet"
+    __type__    = "crypter"
+    __version__ = "0.03"
 
-    __pattern = r'http://(?:www\.)?rapidfileshare\.net/users/\w+/\d+/\w+'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?rapidfileshare\.net/users/\w+/\d+/\w+'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Rapidfileshare.net folder decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("guidobelix", "guidobelix@hotmail.it")]
+    __description__ = """Rapidfileshare.net folder decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("guidobelix", "guidobelix@hotmail.it")]
 
 
     HOSTER_DOMAIN = "rapidfileshare.net"
diff --git a/pyload/plugin/crypter/RelinkUs.py b/pyload/plugin/crypter/RelinkUs.py
index 1773f6a22..1e0f8e371 100644
--- a/pyload/plugin/crypter/RelinkUs.py
+++ b/pyload/plugin/crypter/RelinkUs.py
@@ -12,17 +12,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class RelinkUs(Crypter):
-    __name    = "RelinkUs"
-    __type    = "crypter"
-    __version = "3.11"
+    __name__    = "RelinkUs"
+    __type__    = "crypter"
+    __version__ = "3.11"
 
-    __pattern = r'http://(?:www\.)?relink\.us/(f/|((view|go)\.php\?id=))(?P<id>.+)'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?relink\.us/(f/|((view|go)\.php\?id=))(?P<id>.+)'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Relink.us decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("fragonib", "fragonib[AT]yahoo[DOT]es"),
+    __description__ = """Relink.us decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("fragonib", "fragonib[AT]yahoo[DOT]es"),
                        ("AndroKev", "neureither.kevin@gmail.com")]
 
 
@@ -100,7 +100,7 @@ class RelinkUs(Crypter):
 
 
     def initPackage(self, pyfile):
-        self.fileid = re.match(self.__pattern, pyfile.url).group('id')
+        self.fileid = re.match(self.__pattern__, pyfile.url).group('id')
         self.package = pyfile.package()
         self.password = self.getPassword()
 
diff --git a/pyload/plugin/crypter/SafelinkingNet.py b/pyload/plugin/crypter/SafelinkingNet.py
index 1b5eeeb63..c466d8bb6 100644
--- a/pyload/plugin/crypter/SafelinkingNet.py
+++ b/pyload/plugin/crypter/SafelinkingNet.py
@@ -10,17 +10,17 @@ from pyload.plugin.internal.captcha import SolveMedia
 
 
 class SafelinkingNet(Crypter):
-    __name    = "SafelinkingNet"
-    __type    = "crypter"
-    __version = "0.11"
+    __name__    = "SafelinkingNet"
+    __type__    = "crypter"
+    __version__ = "0.11"
 
-    __pattern = r'https?://(?:www\.)?safelinking\.net/([pd])/\w+'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'https?://(?:www\.)?safelinking\.net/([pd])/\w+'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Safelinking.net decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("quareevo", "quareevo@arcor.de")]
+    __description__ = """Safelinking.net decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("quareevo", "quareevo@arcor.de")]
 
 
     SOLVEMEDIA_PATTERN = "solvemediaApiKey = '([\w.-]+)';"
@@ -29,7 +29,7 @@ class SafelinkingNet(Crypter):
     def decrypt(self, pyfile):
         url = pyfile.url
 
-        if re.match(self.__pattern, url).group(1) == "d":
+        if re.match(self.__pattern__, url).group(1) == "d":
 
             header = self.load(url, just_header=True)
             if 'location' in header:
diff --git a/pyload/plugin/crypter/SecuredIn.py b/pyload/plugin/crypter/SecuredIn.py
index a5e12a352..9aee9e52e 100644
--- a/pyload/plugin/crypter/SecuredIn.py
+++ b/pyload/plugin/crypter/SecuredIn.py
@@ -4,16 +4,16 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class SecuredIn(DeadCrypter):
-    __name    = "SecuredIn"
-    __type    = "crypter"
-    __version = "0.21"
+    __name__    = "SecuredIn"
+    __type__    = "crypter"
+    __version__ = "0.21"
 
-    __pattern = r'http://(?:www\.)?secured\.in/download-[\d]+-\w{8}\.html'
-    __config  = []
+    __pattern__ = r'http://(?:www\.)?secured\.in/download-[\d]+-\w{8}\.html'
+    __config__  = []
 
-    __description = """Secured.in decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("mkaay", "mkaay@mkaay.de")]
+    __description__ = """Secured.in decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("mkaay", "mkaay@mkaay.de")]
 
 
 getInfo = create_getInfo(SecuredIn)
diff --git a/pyload/plugin/crypter/SexuriaCom.py b/pyload/plugin/crypter/SexuriaCom.py
index 08f289541..10101cd7a 100644
--- a/pyload/plugin/crypter/SexuriaCom.py
+++ b/pyload/plugin/crypter/SexuriaCom.py
@@ -6,17 +6,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class SexuriaCom(Crypter):
-    __name    = "SexuriaCom"
-    __type    = "crypter"
-    __version = "0.01"
+    __name__    = "SexuriaCom"
+    __type__    = "crypter"
+    __version__ = "0.01"
 
-    __pattern = r'http://(?:www\.)?sexuria\.com/(v1/)?(Pornos_Kostenlos_.+?_(\d+)\.html|dl_links_\d+_\d+\.html|id=\d+\&part=\d+\&link=\d+)'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?sexuria\.com/(v1/)?(Pornos_Kostenlos_.+?_(\d+)\.html|dl_links_\d+_\d+\.html|id=\d+\&part=\d+\&link=\d+)'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Sexuria.com decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("NETHead", "NETHead.AT.gmx.DOT.net")]
+    __description__ = """Sexuria.com decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("NETHead", "NETHead.AT.gmx.DOT.net")]
 
 
     PATTERN_SUPPORTED_MAIN     = re.compile(r'http://(www\.)?sexuria\.com/(v1/)?Pornos_Kostenlos_.+?_(\d+)\.html', flags=re.I)
diff --git a/pyload/plugin/crypter/ShareLinksBiz.py b/pyload/plugin/crypter/ShareLinksBiz.py
index b3f8f8b75..333e2d8d8 100644
--- a/pyload/plugin/crypter/ShareLinksBiz.py
+++ b/pyload/plugin/crypter/ShareLinksBiz.py
@@ -9,17 +9,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class ShareLinksBiz(Crypter):
-    __name    = "ShareLinksBiz"
-    __type    = "crypter"
-    __version = "1.14"
+    __name__    = "ShareLinksBiz"
+    __type__    = "crypter"
+    __version__ = "1.14"
 
-    __pattern = r'http://(?:www\.)?(share-links|s2l)\.biz/(?P<ID>_?\w+)'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?(share-links|s2l)\.biz/(?P<ID>_?\w+)'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Share-Links.biz decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("fragonib", "fragonib[AT]yahoo[DOT]es")]
+    __description__ = """Share-Links.biz decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("fragonib", "fragonib[AT]yahoo[DOT]es")]
 
 
     def setup(self):
@@ -68,8 +68,8 @@ class ShareLinksBiz(Crypter):
         url = pyfile.url
         if 's2l.biz' in url:
             url = self.load(url, just_header=True)['location']
-        self.baseUrl = "http://www.%s.biz" % re.match(self.__pattern, url).group(1)
-        self.fileId = re.match(self.__pattern, url).group('ID')
+        self.baseUrl = "http://www.%s.biz" % re.match(self.__pattern__, url).group(1)
+        self.fileId = re.match(self.__pattern__, url).group('ID')
         self.package = pyfile.package()
 
 
diff --git a/pyload/plugin/crypter/SharingmatrixCom.py b/pyload/plugin/crypter/SharingmatrixCom.py
index 53f1afa32..be23ada49 100644
--- a/pyload/plugin/crypter/SharingmatrixCom.py
+++ b/pyload/plugin/crypter/SharingmatrixCom.py
@@ -4,15 +4,15 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class SharingmatrixCom(DeadCrypter):
-    __name    = "SharingmatrixCom"
-    __type    = "crypter"
-    __version = "0.01"
+    __name__    = "SharingmatrixCom"
+    __type__    = "crypter"
+    __version__ = "0.01"
 
-    __pattern = r'http://(?:www\.)?sharingmatrix\.com/folder/\w+'
+    __pattern__ = r'http://(?:www\.)?sharingmatrix\.com/folder/\w+'
 
-    __description = """Sharingmatrix.com folder decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """Sharingmatrix.com folder decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
 getInfo = create_getInfo(SharingmatrixCom)
diff --git a/pyload/plugin/crypter/SpeedLoadOrg.py b/pyload/plugin/crypter/SpeedLoadOrg.py
index e40d321be..190ec66eb 100644
--- a/pyload/plugin/crypter/SpeedLoadOrg.py
+++ b/pyload/plugin/crypter/SpeedLoadOrg.py
@@ -4,16 +4,16 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class SpeedLoadOrg(DeadCrypter):
-    __name    = "SpeedLoadOrg"
-    __type    = "crypter"
-    __version = "0.30"
+    __name__    = "SpeedLoadOrg"
+    __type__    = "crypter"
+    __version__ = "0.30"
 
-    __pattern = r'http://(?:www\.)?speedload\.org/(\d+~f$|folder/\d+/)'
-    __config  = []
+    __pattern__ = r'http://(?:www\.)?speedload\.org/(\d+~f$|folder/\d+/)'
+    __config__  = []
 
-    __description = """Speedload decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("stickell", "l.stickell@yahoo.it")]
+    __description__ = """Speedload decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
 getInfo = create_getInfo(SpeedLoadOrg)
diff --git a/pyload/plugin/crypter/StealthTo.py b/pyload/plugin/crypter/StealthTo.py
index 0d05c3c64..8513fb3f8 100644
--- a/pyload/plugin/crypter/StealthTo.py
+++ b/pyload/plugin/crypter/StealthTo.py
@@ -4,16 +4,16 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class StealthTo(DeadCrypter):
-    __name    = "StealthTo"
-    __type    = "crypter"
-    __version = "0.20"
+    __name__    = "StealthTo"
+    __type__    = "crypter"
+    __version__ = "0.20"
 
-    __pattern = r'http://(?:www\.)?stealth\.to/folder/.+'
-    __config  = []
+    __pattern__ = r'http://(?:www\.)?stealth\.to/folder/.+'
+    __config__  = []
 
-    __description = """Stealth.to decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("spoob", "spoob@pyload.org")]
+    __description__ = """Stealth.to decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("spoob", "spoob@pyload.org")]
 
 
 getInfo = create_getInfo(StealthTo)
diff --git a/pyload/plugin/crypter/TnyCz.py b/pyload/plugin/crypter/TnyCz.py
index 19427b845..d73f6de63 100644
--- a/pyload/plugin/crypter/TnyCz.py
+++ b/pyload/plugin/crypter/TnyCz.py
@@ -6,17 +6,17 @@ import re
 
 
 class TnyCz(SimpleCrypter):
-    __name    = "TnyCz"
-    __type    = "crypter"
-    __version = "0.03"
+    __name__    = "TnyCz"
+    __type__    = "crypter"
+    __version__ = "0.03"
 
-    __pattern = r'http://(?:www\.)?tny\.cz/\w+'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?tny\.cz/\w+'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Tny.cz decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description__ = """Tny.cz decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     NAME_PATTERN = r'<title>(?P<N>.+) - .+</title>'
diff --git a/pyload/plugin/crypter/TrailerzoneInfo.py b/pyload/plugin/crypter/TrailerzoneInfo.py
index 106524f1c..c19a5e693 100644
--- a/pyload/plugin/crypter/TrailerzoneInfo.py
+++ b/pyload/plugin/crypter/TrailerzoneInfo.py
@@ -4,16 +4,16 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class TrailerzoneInfo(DeadCrypter):
-    __name    = "TrailerzoneInfo"
-    __type    = "crypter"
-    __version = "0.03"
+    __name__    = "TrailerzoneInfo"
+    __type__    = "crypter"
+    __version__ = "0.03"
 
-    __pattern = r'http://(?:www\.)?trailerzone\.info/.*?'
-    __config  = []
+    __pattern__ = r'http://(?:www\.)?trailerzone\.info/.*?'
+    __config__  = []
 
-    __description = """TrailerZone.info decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("godofdream", "soilfiction@gmail.com")]
+    __description__ = """TrailerZone.info decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("godofdream", "soilfiction@gmail.com")]
 
 
 getInfo = create_getInfo(TrailerzoneInfo)
diff --git a/pyload/plugin/crypter/TurbobitNet.py b/pyload/plugin/crypter/TurbobitNet.py
index 0ea49c694..a1309c083 100644
--- a/pyload/plugin/crypter/TurbobitNet.py
+++ b/pyload/plugin/crypter/TurbobitNet.py
@@ -7,17 +7,17 @@ from pyload.utils import json_loads
 
 
 class TurbobitNet(SimpleCrypter):
-    __name    = "TurbobitNet"
-    __type    = "crypter"
-    __version = "0.05"
+    __name__    = "TurbobitNet"
+    __type__    = "crypter"
+    __version__ = "0.05"
 
-    __pattern = r'http://(?:www\.)?turbobit\.net/download/folder/(?P<ID>\w+)'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?turbobit\.net/download/folder/(?P<ID>\w+)'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Turbobit.net folder decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("stickell", "l.stickell@yahoo.it"),
+    __description__ = """Turbobit.net folder decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("stickell", "l.stickell@yahoo.it"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
@@ -39,6 +39,6 @@ class TurbobitNet(SimpleCrypter):
 
 
     def getLinks(self):
-        id = re.match(self.__pattern, self.pyfile.url).group("ID")
+        id = re.match(self.__pattern__, self.pyfile.url).group("ID")
         fixurl = lambda id: "http://turbobit.net/%s.html" % id
         return map(fixurl, self._getLinks(id))
diff --git a/pyload/plugin/crypter/TusfilesNet.py b/pyload/plugin/crypter/TusfilesNet.py
index 55b9c5deb..88ff941b2 100644
--- a/pyload/plugin/crypter/TusfilesNet.py
+++ b/pyload/plugin/crypter/TusfilesNet.py
@@ -8,17 +8,17 @@ from pyload.plugin.internal.XFSCrypter import XFSCrypter
 
 
 class TusfilesNet(XFSCrypter):
-    __name    = "TusfilesNet"
-    __type    = "crypter"
-    __version = "0.07"
+    __name__    = "TusfilesNet"
+    __type__    = "crypter"
+    __version__ = "0.07"
 
-    __pattern = r'https?://(?:www\.)?tusfiles\.net/go/(?P<ID>\w+)'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'https?://(?:www\.)?tusfiles\.net/go/(?P<ID>\w+)'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Tusfiles.net folder decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("Walter Purcaro", "vuolter@gmail.com"),
+    __description__ = """Tusfiles.net folder decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com"),
                        ("stickell", "l.stickell@yahoo.it")]
 
 
@@ -26,7 +26,7 @@ class TusfilesNet(XFSCrypter):
 
     PAGES_PATTERN = r'>\((\d+) \w+\)<'
 
-    URL_REPLACEMENTS = [(__pattern + ".*", r'https://www.tusfiles.net/go/\g<ID>/')]
+    URL_REPLACEMENTS = [(__pattern__ + ".*", r'https://www.tusfiles.net/go/\g<ID>/')]
 
 
     def loadPage(self, page_n):
diff --git a/pyload/plugin/crypter/UlozTo.py b/pyload/plugin/crypter/UlozTo.py
index d886c9d08..99956ef41 100644
--- a/pyload/plugin/crypter/UlozTo.py
+++ b/pyload/plugin/crypter/UlozTo.py
@@ -5,17 +5,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class UlozTo(Crypter):
-    __name    = "UlozTo"
-    __type    = "crypter"
-    __version = "0.20"
+    __name__    = "UlozTo"
+    __type__    = "crypter"
+    __version__ = "0.20"
 
-    __pattern = r'http://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj\.cz|zachowajto\.pl)/(m|soubory)/.*'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj\.cz|zachowajto\.pl)/(m|soubory)/.*'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Uloz.to folder decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """Uloz.to folder decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     FOLDER_PATTERN = r'<ul class="profile_files">(.*?)</ul>'
diff --git a/pyload/plugin/crypter/UploadableCh.py b/pyload/plugin/crypter/UploadableCh.py
index bf6bd09eb..f5fb0c3bc 100644
--- a/pyload/plugin/crypter/UploadableCh.py
+++ b/pyload/plugin/crypter/UploadableCh.py
@@ -4,17 +4,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class UploadableCh(SimpleCrypter):
-    __name    = "UploadableCh"
-    __type    = "crypter"
-    __version = "0.03"
+    __name__    = "UploadableCh"
+    __type__    = "crypter"
+    __version__ = "0.03"
 
-    __pattern = r'http://(?:www\.)?uploadable\.ch/list/\w+'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?uploadable\.ch/list/\w+'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Uploadable.ch folder decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("guidobelix", "guidobelix@hotmail.it"),
+    __description__ = """Uploadable.ch folder decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("guidobelix", "guidobelix@hotmail.it"),
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
diff --git a/pyload/plugin/crypter/UploadedTo.py b/pyload/plugin/crypter/UploadedTo.py
index fbae7e7d6..1223d32fe 100644
--- a/pyload/plugin/crypter/UploadedTo.py
+++ b/pyload/plugin/crypter/UploadedTo.py
@@ -8,17 +8,17 @@ from pyload.plugin.internal.SimpleCrypter import SimpleCrypter
 
 
 class UploadedTo(SimpleCrypter):
-    __name    = "UploadedTo"
-    __type    = "crypter"
-    __version = "0.42"
+    __name__    = "UploadedTo"
+    __type__    = "crypter"
+    __version__ = "0.42"
 
-    __pattern = r'http://(?:www\.)?(uploaded|ul)\.(to|net)/(f|folder|list)/(?P<id>\w+)'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'http://(?:www\.)?(uploaded|ul)\.(to|net)/(f|folder|list)/(?P<id>\w+)'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """UploadedTo decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("stickell", "l.stickell@yahoo.it")]
+    __description__ = """UploadedTo decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
     PLAIN_PATTERN = r'<small class="date"><a href="(?P<plain>[\w/]+)" onclick='
diff --git a/pyload/plugin/crypter/WiiReloadedOrg.py b/pyload/plugin/crypter/WiiReloadedOrg.py
index 66ef764e4..7b4270e65 100644
--- a/pyload/plugin/crypter/WiiReloadedOrg.py
+++ b/pyload/plugin/crypter/WiiReloadedOrg.py
@@ -4,16 +4,16 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class WiiReloadedOrg(DeadCrypter):
-    __name    = "WiiReloadedOrg"
-    __type    = "crypter"
-    __version = "0.11"
+    __name__    = "WiiReloadedOrg"
+    __type__    = "crypter"
+    __version__ = "0.11"
 
-    __pattern = r'http://(?:www\.)?wii-reloaded\.org/protect/get\.php\?i=.+'
-    __config  = []
+    __pattern__ = r'http://(?:www\.)?wii-reloaded\.org/protect/get\.php\?i=.+'
+    __config__  = []
 
-    __description = """Wii-Reloaded.org decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("hzpz", "")]
+    __description__ = """Wii-Reloaded.org decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("hzpz", "")]
 
 
 getInfo = create_getInfo(WiiReloadedOrg)
diff --git a/pyload/plugin/crypter/WuploadCom.py b/pyload/plugin/crypter/WuploadCom.py
index ad1a789a0..0a098a40c 100644
--- a/pyload/plugin/crypter/WuploadCom.py
+++ b/pyload/plugin/crypter/WuploadCom.py
@@ -4,15 +4,15 @@ from pyload.plugin.internal.DeadCrypter import DeadCrypter, create_getInfo
 
 
 class WuploadCom(DeadCrypter):
-    __name    = "WuploadCom"
-    __type    = "crypter"
-    __version = "0.01"
+    __name__    = "WuploadCom"
+    __type__    = "crypter"
+    __version__ = "0.01"
 
-    __pattern = r'http://(?:www\.)?wupload\.com/folder/\w+'
+    __pattern__ = r'http://(?:www\.)?wupload\.com/folder/\w+'
 
-    __description = """Wupload.com folder decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("zoidberg", "zoidberg@mujmail.cz")]
+    __description__ = """Wupload.com folder decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
 getInfo = create_getInfo(WuploadCom)
diff --git a/pyload/plugin/crypter/XFileSharingPro.py b/pyload/plugin/crypter/XFileSharingPro.py
index eedf7ab26..7cf3cde57 100644
--- a/pyload/plugin/crypter/XFileSharingPro.py
+++ b/pyload/plugin/crypter/XFileSharingPro.py
@@ -6,31 +6,31 @@ from pyload.plugin.internal.XFSCrypter import XFSCrypter
 
 
 class XFileSharingPro(XFSCrypter):
-    __name    = "XFileSharingPro"
-    __type    = "crypter"
-    __version = "0.03"
+    __name__    = "XFileSharingPro"
+    __type__    = "crypter"
+    __version__ = "0.03"
 
-    __pattern = r'^unmatchable$'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'^unmatchable$'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """XFileSharingPro dummy folder decrypter plugin for hook"""
-    __license     = "GPLv3"
-    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description__ = """XFileSharingPro dummy folder decrypter plugin for hook"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     def _log(self, type, args):
         msg = " | ".join([str(a).strip() for a in args if a])
         logger = getattr(self.log, type)
-        logger("%s: %s: %s" % (self.__name, self.HOSTER_NAME, msg or _("%s MARK" % type.upper())))
+        logger("%s: %s: %s" % (self.__name__, self.HOSTER_NAME, msg or _("%s MARK" % type.upper())))
 
 
     def init(self):
         super(XFileSharingPro, self).init()
 
-        self.__pattern = self.core.pluginManager.crypterPlugins[self.__name]['pattern']
+        self.__pattern__ = self.core.pluginManager.crypterPlugins[self.__name__]['pattern']
 
-        self.HOSTER_DOMAIN = re.match(self.__pattern, self.pyfile.url).group(1).lower()
+        self.HOSTER_DOMAIN = re.match(self.__pattern__, self.pyfile.url).group(1).lower()
         self.HOSTER_NAME = "".join([str.capitalize() for str in self.HOSTER_DOMAIN.split('.')])
 
         account = self.core.accountManager.getAccountPlugin(self.HOSTER_NAME)
diff --git a/pyload/plugin/crypter/XupPl.py b/pyload/plugin/crypter/XupPl.py
index 233d96534..b5c8fd6e2 100644
--- a/pyload/plugin/crypter/XupPl.py
+++ b/pyload/plugin/crypter/XupPl.py
@@ -4,17 +4,17 @@ from pyload.plugin.Crypter import Crypter
 
 
 class XupPl(Crypter):
-    __name    = "XupPl"
-    __type    = "crypter"
-    __version = "0.10"
+    __name__    = "XupPl"
+    __type__    = "crypter"
+    __version__ = "0.10"
 
-    __pattern = r'https?://(?:[^/]*\.)?xup\.pl/.*'
-    __config  = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'https?://(?:[^/]*\.)?xup\.pl/.*'
+    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
                    ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
 
-    __description = """Xup.pl decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("z00nx", "z00nx0@gmail.com")]
+    __description__ = """Xup.pl decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("z00nx", "z00nx0@gmail.com")]
 
 
     def decrypt(self, pyfile):
diff --git a/pyload/plugin/crypter/YoutubeBatch.py b/pyload/plugin/crypter/YoutubeBatch.py
index 8f23b0149..2bc1b799e 100644
--- a/pyload/plugin/crypter/YoutubeBatch.py
+++ b/pyload/plugin/crypter/YoutubeBatch.py
@@ -10,20 +10,20 @@ from pyload.utils import safe_join
 
 
 class YoutubeBatch(Crypter):
-    __name    = "YoutubeBatch"
-    __type    = "crypter"
-    __version = "1.01"
+    __name__    = "YoutubeBatch"
+    __type__    = "crypter"
+    __version__ = "1.01"
 
-    __pattern = r'https?://(?:www\.|m\.)?youtube\.com/(?P<TYPE>user|playlist|view_play_list)(/|.*?[?&](?:list|p)=)(?P<ID>[\w-]+)'
-    __config = [("use_subfolder", "bool", "Save package to subfolder", True),
+    __pattern__ = r'https?://(?:www\.|m\.)?youtube\.com/(?P<TYPE>user|playlist|view_play_list)(/|.*?[?&](?:list|p)=)(?P<ID>[\w-]+)'
+    __config__ = [("use_subfolder", "bool", "Save package to subfolder", True),
                 ("subfolder_per_package", "bool", "Create a subfolder for each package", True),
                 ("likes", "bool", "Grab user (channel) liked videos", False),
                 ("favorites", "bool", "Grab user (channel) favorite videos", False),
                 ("uploads", "bool", "Grab channel unplaylisted videos", True)]
 
-    __description = """Youtube.com channel & playlist decrypter plugin"""
-    __license     = "GPLv3"
-    __authors     = [("Walter Purcaro", "vuolter@gmail.com")]
+    __description__ = """Youtube.com channel & playlist decrypter plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     API_KEY = "AIzaSyCKnWLNlkX-L4oD1aEzqqhRw1zczeD6_k0"
@@ -95,7 +95,7 @@ class YoutubeBatch(Crypter):
 
 
     def decrypt(self, pyfile):
-        m = re.match(self.__pattern, pyfile.url)
+        m = re.match(self.__pattern__, pyfile.url)
         m_id = m.group("ID")
         m_type = m.group("TYPE")
author	Walter Purcaro <vuolter@gmail.com>	2015-02-16 03:40:45 +0100
committer	Walter Purcaro <vuolter@gmail.com>	2015-02-16 03:40:45 +0100
commit	fcead1870013b6a970eca7878a66dbe783c80ea3 (patch)
tree	9837d3b2cacba2f5d1a4c620b1cd02f26571b454 /pyload/plugin/crypter
parent	Init cosmetics (diff)
download	pyload-fcead1870013b6a970eca7878a66dbe783c80ea3.tar.xz