Fix __author_name__ and __author_mail__

Merges vuolter/pyload@6c57a37

(cherry picked from commit ce955b6c04f6ddaab1696c6cabf5e0aa83cbf846)

Conflicts:
	module/plugins/Account.py
	module/plugins/Container.py
	module/plugins/Crypter.py
	module/plugins/Hoster.py
	module/plugins/hooks/MultiDebridCom.py
	module/plugins/hooks/UnrestrictLi.py

47 files changed, 93 insertions, 91 deletions

diff --git a/pyload/plugins/accounts/AlldebridCom.py b/pyload/plugins/accounts/AlldebridCom.py
index a353b1744..ea173d19d 100644
--- a/pyload/plugins/accounts/AlldebridCom.py
+++ b/pyload/plugins/accounts/AlldebridCom.py
@@ -12,8 +12,8 @@ class AlldebridCom(MultiHoster):
     __version__ = "0.22"
     __type__ = "account"
     __description__ = """AllDebrid.com account plugin"""
-    __author_name__ = ("Andy, Voigt")
-    __author_mail__ = ("spamsales@online.de")
+    __author_name__ = "Andy Voigt"
+    __author_mail__ = "spamsales@online.de"
 
     def loadAccountInfo(self, user, req):
         data = self.getAccountData(user)
diff --git a/pyload/plugins/accounts/BayfilesCom.py b/pyload/plugins/accounts/BayfilesCom.py
index bf5cc54af..a74952724 100644
--- a/pyload/plugins/accounts/BayfilesCom.py
+++ b/pyload/plugins/accounts/BayfilesCom.py
@@ -28,8 +28,8 @@ class BayfilesCom(Account):
     __version__ = "0.02"
     __type__ = "account"
     __description__ = """bayfiles.com account plugin"""
-    __author_name__ = ("zoidberg")
-    __author_mail__ = ("zoidberg@mujmail.cz")
+    __author_name__ = "zoidberg"
+    __author_mail__ = "zoidberg@mujmail.cz"
 
     def loadAccountInfo(self, user, req):
         for i in range(2):
diff --git a/pyload/plugins/accounts/BitshareCom.py b/pyload/plugins/accounts/BitshareCom.py
index de1e19f51..4fe01aa5b 100644
--- a/pyload/plugins/accounts/BitshareCom.py
+++ b/pyload/plugins/accounts/BitshareCom.py
@@ -25,7 +25,8 @@ class BitshareCom(Account):
     __version__ = "0.12"
     __type__ = "account"
     __description__ = """Bitshare account plugin"""
-    __author_name__ = ("Paul King")
+    __author_name__ = "Paul King"
+    __author_mail__ = ""
 
     def loadAccountInfo(self, user, req):
         page = req.load("http://bitshare.com/mysettings.html")
diff --git a/pyload/plugins/accounts/CramitIn.py b/pyload/plugins/accounts/CramitIn.py
index b0334b191..be7baff9d 100644
--- a/pyload/plugins/accounts/CramitIn.py
+++ b/pyload/plugins/accounts/CramitIn.py
@@ -7,7 +7,7 @@ class CramitIn(XFSPAccount):
     __version__ = "0.01"
     __type__ = "account"
     __description__ = """cramit.in account plugin"""
-    __author_name__ = ("zoidberg")
-    __author_mail__ = ("zoidberg@mujmail.cz")
+    __author_name__ = "zoidberg"
+    __author_mail__ = "zoidberg@mujmail.cz"
 
     MAIN_PAGE = "http://cramit.in/"
diff --git a/pyload/plugins/accounts/CyberlockerCh.py b/pyload/plugins/accounts/CyberlockerCh.py
index 0eaa262eb..1deac2730 100644
--- a/pyload/plugins/accounts/CyberlockerCh.py
+++ b/pyload/plugins/accounts/CyberlockerCh.py
@@ -8,8 +8,8 @@ class CyberlockerCh(XFSPAccount):
     __version__ = "0.01"
     __type__ = "account"
     __description__ = """CyberlockerCh account plugin"""
-    __author_name__ = ("stickell")
-    __author_mail__ = ("l.stickell@yahoo.it")
+    __author_name__ = "stickell"
+    __author_mail__ = "l.stickell@yahoo.it"
 
     MAIN_PAGE = "http://cyberlocker.ch/"
 
diff --git a/pyload/plugins/accounts/DdlstorageCom.py b/pyload/plugins/accounts/DdlstorageCom.py
index 7404348a4..08ff537da 100644
--- a/pyload/plugins/accounts/DdlstorageCom.py
+++ b/pyload/plugins/accounts/DdlstorageCom.py
@@ -15,8 +15,8 @@ class DdlstorageCom(XFSPAccount):
     __version__ = "1.00"
     __type__ = "account"
     __description__ = """DDLStorage.com account plugin"""
-    __author_name__ = ("stickell")
-    __author_mail__ = ("l.stickell@yahoo.it")
+    __author_name__ = "stickell"
+    __author_mail__ = "l.stickell@yahoo.it"
 
     MAIN_PAGE = "http://ddlstorage.com/"
 
diff --git a/pyload/plugins/accounts/DebridItaliaCom.py b/pyload/plugins/accounts/DebridItaliaCom.py
index 30bfa65f9..530bfa470 100644
--- a/pyload/plugins/accounts/DebridItaliaCom.py
+++ b/pyload/plugins/accounts/DebridItaliaCom.py
@@ -26,8 +26,8 @@ class DebridItaliaCom(MultiHoster):
     __version__ = "0.1"
     __type__ = "account"
     __description__ = """debriditalia.com account plugin"""
-    __author_name__ = ("stickell")
-    __author_mail__ = ("l.stickell@yahoo.it")
+    __author_name__ = "stickell"
+    __author_mail__ = "l.stickell@yahoo.it"
 
     WALID_UNTIL_PATTERN = r"Premium valid till: (?P<D>[^|]+) \|"
 
diff --git a/pyload/plugins/accounts/EasybytezCom.py b/pyload/plugins/accounts/EasybytezCom.py
index ffd132ba3..b14031779 100644
--- a/pyload/plugins/accounts/EasybytezCom.py
+++ b/pyload/plugins/accounts/EasybytezCom.py
@@ -30,8 +30,8 @@ class EasybytezCom(Account):
     __version__ = "0.04"
     __type__ = "account"
     __description__ = """EasyBytez.com account plugin"""
-    __author_name__ = ("zoidberg")
-    __author_mail__ = ("zoidberg@mujmail.cz")
+    __author_name__ = "zoidberg"
+    __author_mail__ = "zoidberg@mujmail.cz"
 
     VALID_UNTIL_PATTERN = r'Premium account expire:</TD><TD><b>([^<]+)</b>'
     TRAFFIC_LEFT_PATTERN = r'<TR><TD>Traffic available today:</TD><TD><b>(?P<S>[^<]+)</b>'
diff --git a/pyload/plugins/accounts/EgoFilesCom.py b/pyload/plugins/accounts/EgoFilesCom.py
index 9c2b918c3..67a4a1aca 100644
--- a/pyload/plugins/accounts/EgoFilesCom.py
+++ b/pyload/plugins/accounts/EgoFilesCom.py
@@ -12,8 +12,8 @@ class EgoFilesCom(Account):
     __version__ = "0.2"
     __type__ = "account"
     __description__ = """egofiles.com account plugin"""
-    __author_name__ = ("stickell")
-    __author_mail__ = ("l.stickell@yahoo.it")
+    __author_name__ = "stickell"
+    __author_mail__ = "l.stickell@yahoo.it"
 
     PREMIUM_ACCOUNT_PATTERN = '<br/>\s*Premium: (?P<P>[^/]*) / Traffic left: (?P<T>[\d.]*) (?P<U>\w*)\s*\\n\s*<br/>'
 
diff --git a/pyload/plugins/accounts/EuroshareEu.py b/pyload/plugins/accounts/EuroshareEu.py
index 830c1db3f..e0c8a9e4a 100644
--- a/pyload/plugins/accounts/EuroshareEu.py
+++ b/pyload/plugins/accounts/EuroshareEu.py
@@ -28,8 +28,8 @@ class EuroshareEu(Account):
     __version__ = "0.01"
     __type__ = "account"
     __description__ = """euroshare.eu account plugin"""
-    __author_name__ = ("zoidberg")
-    __author_mail__ = ("zoidberg@mujmail.cz")
+    __author_name__ = "zoidberg"
+    __author_mail__ = "zoidberg@mujmail.cz"
 
     def loadAccountInfo(self, user, req):
         self.relogin(user)
diff --git a/pyload/plugins/accounts/FastixRu.py b/pyload/plugins/accounts/FastixRu.py
index 3e1896e44..14ac6ef70 100644
--- a/pyload/plugins/accounts/FastixRu.py
+++ b/pyload/plugins/accounts/FastixRu.py
@@ -7,8 +7,8 @@ class FastixRu(Account):
     __version__ = "0.02"
     __type__ = "account"
     __description__ = """Fastix account plugin"""
-    __author_name__ = ("Massimo, Rosamilia")
-    __author_mail__ = ("max@spiritix.eu")
+    __author_name__ = "Massimo Rosamilia"
+    __author_mail__ = "max@spiritix.eu"
 
     def loadAccountInfo(self, user, req):
         data = self.getAccountData(user)
diff --git a/pyload/plugins/accounts/FilejungleCom.py b/pyload/plugins/accounts/FilejungleCom.py
index 2f2a6012d..fb56693d9 100644
--- a/pyload/plugins/accounts/FilejungleCom.py
+++ b/pyload/plugins/accounts/FilejungleCom.py
@@ -28,8 +28,8 @@ class FilejungleCom(Account):
     __version__ = "0.11"
     __type__ = "account"
     __description__ = """filejungle.com account plugin"""
-    __author_name__ = ("zoidberg")
-    __author_mail__ = ("zoidberg@mujmail.cz")
+    __author_name__ = "zoidberg"
+    __author_mail__ = "zoidberg@mujmail.cz"
 
     login_timeout = 60
 
diff --git a/pyload/plugins/accounts/FilerNet.py b/pyload/plugins/accounts/FilerNet.py
index 45ce5ab37..66988c338 100644
--- a/pyload/plugins/accounts/FilerNet.py
+++ b/pyload/plugins/accounts/FilerNet.py
@@ -27,8 +27,8 @@ class FilerNet(Account):
     __version__ = "0.01"
     __type__ = "account"
     __description__ = """Filer.net account plugin"""
-    __author_name__ = ("stickell")
-    __author_mail__ = ("l.stickell@yahoo.it")
+    __author_name__ = "stickell"
+    __author_mail__ = "l.stickell@yahoo.it"
 
     TOKEN_PATTERN = r'_csrf_token" value="([^"]+)" />'
     WALID_UNTIL_PATTERN = r"Der Premium-Zugang ist gültig bis (.+)\.\s*</td>"
diff --git a/pyload/plugins/accounts/FilerioCom.py b/pyload/plugins/accounts/FilerioCom.py
index 8b0b5f54f..61626c317 100644
--- a/pyload/plugins/accounts/FilerioCom.py
+++ b/pyload/plugins/accounts/FilerioCom.py
@@ -7,7 +7,7 @@ class FilerioCom(XFSPAccount):
     __version__ = "0.01"
     __type__ = "account"
     __description__ = """FileRio.in account plugin"""
-    __author_name__ = ("zoidberg")
-    __author_mail__ = ("zoidberg@mujmail.cz")
+    __author_name__ = "zoidberg"
+    __author_mail__ = "zoidberg@mujmail.cz"
 
     MAIN_PAGE = "http://filerio.in/"
diff --git a/pyload/plugins/accounts/FilesMailRu.py b/pyload/plugins/accounts/FilesMailRu.py
index ea976bd44..c316ebf42 100644
--- a/pyload/plugins/accounts/FilesMailRu.py
+++ b/pyload/plugins/accounts/FilesMailRu.py
@@ -25,8 +25,8 @@ class FilesMailRu(Account):
     __version__ = "0.1"
     __type__ = "account"
     __description__ = """filesmail.ru account plugin"""
-    __author_name__ = ("RaNaN")
-    __author_mail__ = ("RaNaN@pyload.org")
+    __author_name__ = "RaNaN"
+    __author_mail__ = "RaNaN@pyload.org"
 
     def loadAccountInfo(self, user, req):
         return {"validuntil": None, "trafficleft": None}
diff --git a/pyload/plugins/accounts/FileserveCom.py b/pyload/plugins/accounts/FileserveCom.py
index d4056891a..d6f286cfd 100644
--- a/pyload/plugins/accounts/FileserveCom.py
+++ b/pyload/plugins/accounts/FileserveCom.py
@@ -28,8 +28,8 @@ class FileserveCom(Account):
     __version__ = "0.2"
     __type__ = "account"
     __description__ = """fileserve.com account plugin"""
-    __author_name__ = ("mkaay")
-    __author_mail__ = ("mkaay@mkaay.de")
+    __author_name__ = "mkaay"
+    __author_mail__ = "mkaay@mkaay.de"
 
     def loadAccountInfo(self, user, req):
         data = self.getAccountData(user)
diff --git a/pyload/plugins/accounts/FourSharedCom.py b/pyload/plugins/accounts/FourSharedCom.py
index 69a465671..ba692d2db 100644
--- a/pyload/plugins/accounts/FourSharedCom.py
+++ b/pyload/plugins/accounts/FourSharedCom.py
@@ -26,8 +26,8 @@ class FourSharedCom(Account):
     __version__ = "0.01"
     __type__ = "account"
     __description__ = """FourSharedCom account plugin"""
-    __author_name__ = ("zoidberg")
-    __author_mail__ = ("zoidberg@mujmail.cz")
+    __author_name__ = "zoidberg"
+    __author_mail__ = "zoidberg@mujmail.cz"
 
     def loadAccountInfo(self, user, req):
         #fixme
diff --git a/pyload/plugins/accounts/FreakshareCom.py b/pyload/plugins/accounts/FreakshareCom.py
index cdf45114a..dd666f653 100644
--- a/pyload/plugins/accounts/FreakshareCom.py
+++ b/pyload/plugins/accounts/FreakshareCom.py
@@ -27,8 +27,8 @@ class FreakshareCom(Account):
     __version__ = "0.1"
     __type__ = "account"
     __description__ = """freakshare.com account plugin"""
-    __author_name__ = ("RaNaN")
-    __author_mail__ = ("RaNaN@pyload.org")
+    __author_name__ = "RaNaN"
+    __author_mail__ = "RaNaN@pyload.org"
 
     def loadAccountInfo(self, user, req):
         page = req.load("http://freakshare.com/")
diff --git a/pyload/plugins/accounts/Ftp.py b/pyload/plugins/accounts/Ftp.py
index 681d14cea..b454cba7a 100644
--- a/pyload/plugins/accounts/Ftp.py
+++ b/pyload/plugins/accounts/Ftp.py
@@ -8,7 +8,7 @@ class Ftp(Account):
     __version__ = "0.01"
     __type__ = "account"
     __description__ = """Ftp dummy account plugin"""
-    __author_name__ = ("zoidberg")
-    __author_mail__ = ("zoidberg@mujmail.cz")
+    __author_name__ = "zoidberg"
+    __author_mail__ = "zoidberg@mujmail.cz"
 
     login_timeout = info_threshold = 1000000
diff --git a/pyload/plugins/accounts/HellshareCz.py b/pyload/plugins/accounts/HellshareCz.py
index 4718ade99..0759912e6 100644
--- a/pyload/plugins/accounts/HellshareCz.py
+++ b/pyload/plugins/accounts/HellshareCz.py
@@ -28,8 +28,8 @@ class HellshareCz(Account):
     __version__ = "0.14"
     __type__ = "account"
     __description__ = """hellshare.cz account plugin"""
-    __author_name__ = ("zoidberg")
-    __author_mail__ = ("zoidberg@mujmail.cz")
+    __author_name__ = "zoidberg"
+    __author_mail__ = "zoidberg@mujmail.cz"
 
     CREDIT_LEFT_PATTERN = r'<div class="credit-link">\s*<table>\s*<tr>\s*<th>(\d+|\d\d\.\d\d\.)</th>'
 
diff --git a/pyload/plugins/accounts/Http.py b/pyload/plugins/accounts/Http.py
index de9490b2c..0afb5b3f7 100644
--- a/pyload/plugins/accounts/Http.py
+++ b/pyload/plugins/accounts/Http.py
@@ -8,12 +8,12 @@ class Http(Account):
     __version__ = "0.01"
     __type__ = "account"
     __description__ = """Http dummy account plugin"""
-    __author_name__ = ("zoidberg")
-    __author_mail__ = ("zoidberg@mujmail.cz")
+    __author_name__ = "zoidberg"
+    __author_mail__ = "zoidberg@mujmail.cz"
 
     __config__ = [("domain", "str", "Domain", "")]
 
     login_timeout = info_threshold = 1000000
 
     def login(self, req):
-        pass
\ No newline at end of file
+        pass
diff --git a/pyload/plugins/accounts/LetitbitNet.py b/pyload/plugins/accounts/LetitbitNet.py
index bcc004b91..9e2f570b3 100644
--- a/pyload/plugins/accounts/LetitbitNet.py
+++ b/pyload/plugins/accounts/LetitbitNet.py
@@ -24,8 +24,8 @@ class LetitbitNet(Account):
     __version__ = "0.01"
     __type__ = "account"
     __description__ = """Letitbit.net account plugin"""
-    __author_name__ = ("stickell")
-    __author_mail__ = ("l.stickell@yahoo.it")
+    __author_name__ = "stickell"
+    __author_mail__ = "l.stickell@yahoo.it"
 
     def loadAccountInfo(self, user, req):
         ## DISABLED BECAUSE IT GET 'key exausted' EVEN IF VALID ##
diff --git a/pyload/plugins/accounts/MegasharesCom.py b/pyload/plugins/accounts/MegasharesCom.py
index e7d5f9ca9..4c44ddfad 100644
--- a/pyload/plugins/accounts/MegasharesCom.py
+++ b/pyload/plugins/accounts/MegasharesCom.py
@@ -11,8 +11,8 @@ class MegasharesCom(Account):
     __version__ = "0.02"
     __type__ = "account"
     __description__ = """megashares.com account plugin"""
-    __author_name__ = ("zoidberg")
-    __author_mail__ = ("zoidberg@mujmail.cz")
+    __author_name__ = "zoidberg"
+    __author_mail__ = "zoidberg@mujmail.cz"
 
     VALID_UNTIL_PATTERN = r'<p class="premium_info_box">Period Ends: (\w{3} \d{1,2}, \d{4})</p>'
 
diff --git a/pyload/plugins/accounts/MultiDebridCom.py b/pyload/plugins/accounts/MultiDebridCom.py
index a98b8abae..5d3536684 100644
--- a/pyload/plugins/accounts/MultiDebridCom.py
+++ b/pyload/plugins/accounts/MultiDebridCom.py
@@ -26,8 +26,8 @@ class MultiDebridCom(MultiHoster):
     __version__ = "0.01"
     __type__ = "account"
     __description__ = """Multi-debrid.com account plugin"""
-    __author_name__ = ("stickell")
-    __author_mail__ = ("l.stickell@yahoo.it")
+    __author_name__ = "stickell"
+    __author_mail__ = "l.stickell@yahoo.it"
 
     def loadAccountInfo(self, user, req):
         if 'days_left' in self.json_data:
diff --git a/pyload/plugins/accounts/MultishareCz.py b/pyload/plugins/accounts/MultishareCz.py
index a50ced431..baf156abf 100644
--- a/pyload/plugins/accounts/MultishareCz.py
+++ b/pyload/plugins/accounts/MultishareCz.py
@@ -29,8 +29,8 @@ class MultishareCz(MultiHoster):
     __version__ = "0.02"
     __type__ = "account"
     __description__ = """multishare.cz account plugin"""
-    __author_name__ = ("zoidberg")
-    __author_mail__ = ("zoidberg@mujmail.cz")
+    __author_name__ = "zoidberg"
+    __author_mail__ = "zoidberg@mujmail.cz"
 
     TRAFFIC_LEFT_PATTERN = r'<span class="profil-zvyrazneni">Kredit:</span>\s*<strong>(?P<S>[0-9,]+)&nbsp;(?P<U>\w+)</strong>'
     ACCOUNT_INFO_PATTERN = r'<input type="hidden" id="(u_ID|u_hash)" name="[^"]*" value="([^"]+)">'
diff --git a/pyload/plugins/accounts/PremiumizeMe.py b/pyload/plugins/accounts/PremiumizeMe.py
index 8b4569f06..e2f85e394 100644
--- a/pyload/plugins/accounts/PremiumizeMe.py
+++ b/pyload/plugins/accounts/PremiumizeMe.py
@@ -7,8 +7,8 @@ class PremiumizeMe(MultiHoster):
     __version__ = "0.11"
     __type__ = "account"
     __description__ = """Premiumize.Me account plugin"""
-    __author_name__ = ("Florian Franzen")
-    __author_mail__ = ("FlorianFranzen@gmail.com")
+    __author_name__ = "Florian Franzen"
+    __author_mail__ = "FlorianFranzen@gmail.com"
 
     def loadAccountInfo(self, user, req):
         # Get user data from premiumize.me
diff --git a/pyload/plugins/accounts/QuickshareCz.py b/pyload/plugins/accounts/QuickshareCz.py
index 1af7cbffd..514db235f 100644
--- a/pyload/plugins/accounts/QuickshareCz.py
+++ b/pyload/plugins/accounts/QuickshareCz.py
@@ -27,8 +27,8 @@ class QuickshareCz(Account):
     __version__ = "0.01"
     __type__ = "account"
     __description__ = """quickshare.cz account plugin"""
-    __author_name__ = ("zoidberg")
-    __author_mail__ = ("zoidberg@mujmail.cz")
+    __author_name__ = "zoidberg"
+    __author_mail__ = "zoidberg@mujmail.cz"
 
     def loadAccountInfo(self, user, req):
         html = req.load("http://www.quickshare.cz/premium", decode=True)
diff --git a/pyload/plugins/accounts/RPNetBiz.py b/pyload/plugins/accounts/RPNetBiz.py
index ceb5e6bbb..6c5b76653 100644
--- a/pyload/plugins/accounts/RPNetBiz.py
+++ b/pyload/plugins/accounts/RPNetBiz.py
@@ -7,8 +7,8 @@ class RPNetBiz(Account):
     __version__ = "0.1"
     __type__ = "account"
     __description__ = """RPNet.biz account plugin"""
-    __author_name__ = ("Dman")
-    __author_mail__ = ("dmanugm@gmail.com")
+    __author_name__ = "Dman"
+    __author_mail__ = "dmanugm@gmail.com"
 
     def loadAccountInfo(self, user, req):
         # Get account information from rpnet.biz
diff --git a/pyload/plugins/accounts/RapidgatorNet.py b/pyload/plugins/accounts/RapidgatorNet.py
index 8a02b712c..5fae5ea7e 100644
--- a/pyload/plugins/accounts/RapidgatorNet.py
+++ b/pyload/plugins/accounts/RapidgatorNet.py
@@ -26,8 +26,8 @@ class RapidgatorNet(Account):
     __version__ = "0.04"
     __type__ = "account"
     __description__ = """rapidgator.net account plugin"""
-    __author_name__ = ("zoidberg")
-    __author_mail__ = ("zoidberg@mujmail.cz")
+    __author_name__ = "zoidberg"
+    __author_mail__ = "zoidberg@mujmail.cz"
 
     API_URL = 'http://rapidgator.net/api/user'
 
diff --git a/pyload/plugins/accounts/RapidshareCom.py b/pyload/plugins/accounts/RapidshareCom.py
index b2066cd1e..bc41ac5e1 100644
--- a/pyload/plugins/accounts/RapidshareCom.py
+++ b/pyload/plugins/accounts/RapidshareCom.py
@@ -25,8 +25,8 @@ class RapidshareCom(Account):
     __version__ = "0.22"
     __type__ = "account"
     __description__ = """Rapidshare.com account plugin"""
-    __author_name__ = ("mkaay")
-    __author_mail__ = ("mkaay@mkaay.de")
+    __author_name__ = "mkaay"
+    __author_mail__ = "mkaay@mkaay.de"
 
     def loadAccountInfo(self, user, req):
         data = self.getAccountData(user)
diff --git a/pyload/plugins/accounts/RarefileNet.py b/pyload/plugins/accounts/RarefileNet.py
index f4ae4a79a..c79bc2cc5 100644
--- a/pyload/plugins/accounts/RarefileNet.py
+++ b/pyload/plugins/accounts/RarefileNet.py
@@ -7,7 +7,7 @@ class RarefileNet(XFSPAccount):
     __version__ = "0.02"
     __type__ = "account"
     __description__ = """RareFile.net account plugin"""
-    __author_name__ = ("zoidberg")
-    __author_mail__ = ("zoidberg@mujmail.cz")
+    __author_name__ = "zoidberg"
+    __author_mail__ = "zoidberg@mujmail.cz"
 
     MAIN_PAGE = "http://rarefile.net/"
diff --git a/pyload/plugins/accounts/RealdebridCom.py b/pyload/plugins/accounts/RealdebridCom.py
index 84c61f2e8..f0be58719 100644
--- a/pyload/plugins/accounts/RealdebridCom.py
+++ b/pyload/plugins/accounts/RealdebridCom.py
@@ -8,8 +8,8 @@ class RealdebridCom(MultiHoster):
     __version__ = "0.43"
     __type__ = "account"
     __description__ = """Real-Debrid.com account plugin"""
-    __author_name__ = ("Devirex, Hazzard")
-    __author_mail__ = ("naibaf_11@yahoo.de")
+    __author_name__ = "Devirex Hazzard"
+    __author_mail__ = "naibaf_11@yahoo.de"
 
     def loadAccountInfo(self, req):
         if self.pin_code:
diff --git a/pyload/plugins/accounts/RehostTo.py b/pyload/plugins/accounts/RehostTo.py
index 58c91801b..f040ddbb1 100644
--- a/pyload/plugins/accounts/RehostTo.py
+++ b/pyload/plugins/accounts/RehostTo.py
@@ -6,8 +6,8 @@ class RehostTo(Account):
     __version__ = "0.1"
     __type__ = "account"
     __description__ = """Rehost.to account plugin"""
-    __author_name__ = ("RaNaN")
-    __author_mail__ = ("RaNaN@pyload.org")
+    __author_name__ = "RaNaN"
+    __author_mail__ = "RaNaN@pyload.org"
 
     def loadAccountInfo(self, user, req):
         data = self.getAccountData(user)
diff --git a/pyload/plugins/accounts/ReloadCc.py b/pyload/plugins/accounts/ReloadCc.py
index b3c26c6d3..3bc28ee9f 100644
--- a/pyload/plugins/accounts/ReloadCc.py
+++ b/pyload/plugins/accounts/ReloadCc.py
@@ -11,8 +11,8 @@ class ReloadCc(Account):
     __type__ = "account"
     __description__ = """Reload.Cc account plugin"""
 
-    __author_name__ = ("Reload Team")
-    __author_mail__ = ("hello@reload.cc")
+    __author_name__ = "Reload Team"
+    __author_mail__ = "hello@reload.cc"
 
     def loadAccountInfo(self, user, req):
 
diff --git a/pyload/plugins/accounts/ShareRapidCom.py b/pyload/plugins/accounts/ShareRapidCom.py
index b532768b1..776773eb6 100644
--- a/pyload/plugins/accounts/ShareRapidCom.py
+++ b/pyload/plugins/accounts/ShareRapidCom.py
@@ -11,6 +11,7 @@ class ShareRapidCom(Account):
     __type__ = "account"
     __description__ = """ShareRapid account plugin"""
     __author_name__ = ("MikyWoW", "zoidberg")
+    __author_mail__ = ("mikywow@seznam.cz", "zoidberg@mujmail.cz")
 
     login_timeout = 60
 
diff --git a/pyload/plugins/accounts/SimplydebridCom.py b/pyload/plugins/accounts/SimplydebridCom.py
index 0b4c82a3b..e1c432860 100644
--- a/pyload/plugins/accounts/SimplydebridCom.py
+++ b/pyload/plugins/accounts/SimplydebridCom.py
@@ -9,8 +9,8 @@ class SimplydebridCom(MultiHoster):
     __version__ = "0.1"
     __type__ = "account"
     __description__ = """Simply-Debrid.com account plugin"""
-    __author_name__ = ("Kagenoshin")
-    __author_mail__ = ("kagenoshin@gmx.ch")
+    __author_name__ = "Kagenoshin"
+    __author_mail__ = "kagenoshin@gmx.ch"
 
     def loadAccountInfo(self, user, req):
         get_data = {'login': 2, 'u': self.loginname, 'p': self.password}
diff --git a/pyload/plugins/accounts/StahnuTo.py b/pyload/plugins/accounts/StahnuTo.py
index 6e2b1c96d..e371a89b1 100644
--- a/pyload/plugins/accounts/StahnuTo.py
+++ b/pyload/plugins/accounts/StahnuTo.py
@@ -28,8 +28,8 @@ class StahnuTo(Account):
     __version__ = "0.02"
     __type__ = "account"
     __description__ = """StahnuTo account plugin"""
-    __author_name__ = ("zoidberg")
-    __author_mail__ = ("zoidberg@mujmail.cz")
+    __author_name__ = "zoidberg"
+    __author_mail__ = "zoidberg@mujmail.cz"
 
     #login_timeout = 60
 
diff --git a/pyload/plugins/accounts/TurbobitNet.py b/pyload/plugins/accounts/TurbobitNet.py
index 5d4471c30..73615b13a 100644
--- a/pyload/plugins/accounts/TurbobitNet.py
+++ b/pyload/plugins/accounts/TurbobitNet.py
@@ -28,8 +28,8 @@ class TurbobitNet(Account):
     __version__ = "0.01"
     __type__ = "account"
     __description__ = """TurbobitNet account plugin"""
-    __author_name__ = ("zoidberg")
-    __author_mail__ = ("zoidberg@mujmail.cz")
+    __author_name__ = "zoidberg"
+    __author_mail__ = "zoidberg@mujmail.cz"
 
     #login_timeout = 60
 
diff --git a/pyload/plugins/accounts/UlozTo.py b/pyload/plugins/accounts/UlozTo.py
index 429a32db3..e1596e164 100644
--- a/pyload/plugins/accounts/UlozTo.py
+++ b/pyload/plugins/accounts/UlozTo.py
@@ -11,7 +11,7 @@ class UlozTo(Account):
     __type__ = "account"
     __description__ = """uloz.to account plugin"""
     __author_name__ = ("zoidberg", "pulpe")
-    __author_mail__ = ("zoidberg@mujmail.cz")
+    __author_mail__ = "zoidberg@mujmail.cz"
 
     TRAFFIC_LEFT_PATTERN = r'<li class="menu-kredit"><a href="/kredit" title="[^"]*?GB = ([0-9.]+) MB"'
 
diff --git a/pyload/plugins/accounts/UnrestrictLi.py b/pyload/plugins/accounts/UnrestrictLi.py
index bfa81a6ef..1c5263e28 100644
--- a/pyload/plugins/accounts/UnrestrictLi.py
+++ b/pyload/plugins/accounts/UnrestrictLi.py
@@ -24,8 +24,8 @@ class UnrestrictLi(MultiHoster):
     __version__ = "0.03"
     __type__ = "account"
     __description__ = """Unrestrict.li account plugin"""
-    __author_name__ = ("stickell")
-    __author_mail__ = ("l.stickell@yahoo.it")
+    __author_name__ = "stickell"
+    __author_mail__ = "l.stickell@yahoo.it"
 
     def loadAccountInfo(self, user, req):
         json_data = req.load('http://unrestrict.li/api/jdownloader/user.php?format=json')
diff --git a/pyload/plugins/accounts/UploadedTo.py b/pyload/plugins/accounts/UploadedTo.py
index ac1f3fd35..a9e86e297 100644
--- a/pyload/plugins/accounts/UploadedTo.py
+++ b/pyload/plugins/accounts/UploadedTo.py
@@ -28,8 +28,8 @@ class UploadedTo(Account):
     __version__ = "0.26"
     __type__ = "account"
     __description__ = """ul.net account plugin"""
-    __author_name__ = ("mkaay")
-    __author_mail__ = ("mkaay@mkaay.de")
+    __author_name__ = "mkaay"
+    __author_mail__ = "mkaay@mkaay.de"
 
     def loadAccountInfo(self, user, req):
 
diff --git a/pyload/plugins/accounts/UploadheroCom.py b/pyload/plugins/accounts/UploadheroCom.py
index 12463f285..c43dcfbd1 100644
--- a/pyload/plugins/accounts/UploadheroCom.py
+++ b/pyload/plugins/accounts/UploadheroCom.py
@@ -13,8 +13,8 @@ class UploadheroCom(Account):
     __version__ = "0.2"
     __type__ = "account"
     __description__ = """Uploadhero.co account plugin"""
-    __author_name__ = ("mcmyst")
-    __author_mail__ = ("mcmyst@hotmail.fr")
+    __author_name__ = "mcmyst"
+    __author_mail__ = "mcmyst@hotmail.fr"
 
     def loadAccountInfo(self, user, req):
         premium_pattern = re.compile('Il vous reste <span class="bleu">([0-9]+)</span> jours premium.')
diff --git a/pyload/plugins/accounts/UploadingCom.py b/pyload/plugins/accounts/UploadingCom.py
index d13df4f9d..187434b19 100644
--- a/pyload/plugins/accounts/UploadingCom.py
+++ b/pyload/plugins/accounts/UploadingCom.py
@@ -28,8 +28,8 @@ class UploadingCom(Account):
     __version__ = "0.1"
     __type__ = "account"
     __description__ = """uploading.com account plugin"""
-    __author_name__ = ("mkaay")
-    __author_mail__ = ("mkaay@mkaay.de")
+    __author_name__ = "mkaay"
+    __author_mail__ = "mkaay@mkaay.de"
 
     def loadAccountInfo(self, user, req):
         src = req.load("http://uploading.com/")
diff --git a/pyload/plugins/accounts/UptoboxCom.py b/pyload/plugins/accounts/UptoboxCom.py
index 17ca81f68..0215254bd 100644
--- a/pyload/plugins/accounts/UptoboxCom.py
+++ b/pyload/plugins/accounts/UptoboxCom.py
@@ -7,8 +7,8 @@ class UptoboxCom(XFSPAccount):
     __version__ = "0.02"
     __type__ = "account"
     __description__ = """DDLStorage.com account plugin"""
-    __author_name__ = ("zoidberg")
-    __author_mail__ = ("zoidberg@mujmail.cz")
+    __author_name__ = "zoidberg"
+    __author_mail__ = "zoidberg@mujmail.cz"
 
     MAIN_PAGE = "http://uptobox.com/"
 
diff --git a/pyload/plugins/accounts/WarserverCz.py b/pyload/plugins/accounts/WarserverCz.py
index 2c871eb6d..62c7e19fa 100644
--- a/pyload/plugins/accounts/WarserverCz.py
+++ b/pyload/plugins/accounts/WarserverCz.py
@@ -28,8 +28,8 @@ class WarserverCz(Account):
     __version__ = "0.02"
     __type__ = "account"
     __description__ = """Warserver.cz account plugin"""
-    __author_name__ = ("zoidberg")
-    __author_mail__ = ("zoidberg@mujmail.cz")
+    __author_name__ = "zoidberg"
+    __author_mail__ = "zoidberg@mujmail.cz"
 
     VALID_UNTIL_PATTERN = ur'<li>Neomezené stahování do: <strong>(.+?)<'
     TRAFFIC_LEFT_PATTERN = ur'<li>Kredit: <strong>(.+?)<'
diff --git a/pyload/plugins/accounts/YibaishiwuCom.py b/pyload/plugins/accounts/YibaishiwuCom.py
index c4eab74dc..75aae25b9 100644
--- a/pyload/plugins/accounts/YibaishiwuCom.py
+++ b/pyload/plugins/accounts/YibaishiwuCom.py
@@ -27,8 +27,8 @@ class YibaishiwuCom(Account):
     __version__ = "0.01"
     __type__ = "account"
     __description__ = """115.com account plugin"""
-    __author_name__ = ("zoidberg")
-    __author_mail__ = ("zoidberg@mujmail.cz")
+    __author_name__ = "zoidberg"
+    __author_mail__ = "zoidberg@mujmail.cz"
 
     ACCOUNT_INFO_PATTERN = r'var USER_PERMISSION = {(.*?)}'
 
diff --git a/pyload/plugins/accounts/ZeveraCom.py b/pyload/plugins/accounts/ZeveraCom.py
index 8f05f1d76..dcba478df 100644
--- a/pyload/plugins/accounts/ZeveraCom.py
+++ b/pyload/plugins/accounts/ZeveraCom.py
@@ -9,8 +9,8 @@ class ZeveraCom(MultiHoster):
     __version__ = "0.21"
     __type__ = "account"
     __description__ = """Zevera.com account plugin"""
-    __author_name__ = ("zoidberg")
-    __author_mail__ = ("zoidberg@mujmail.cz")
+    __author_name__ = "zoidberg"
+    __author_mail__ = "zoidberg@mujmail.cz"
 
     def loadAccountInfo(self, user, req):
         data = self.getAPIData(req)