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

11 files changed, 20 insertions, 18 deletions

diff --git a/module/plugins/accounts/FreeWayMe.py b/module/plugins/accounts/FreeWayMe.py
index 0222ad65f..955cc3c7f 100644
--- a/module/plugins/accounts/FreeWayMe.py
+++ b/module/plugins/accounts/FreeWayMe.py
@@ -26,8 +26,8 @@ class FreeWayMe(Account):
     __version__ = "0.11"
     __type__ = "account"
     __description__ = """FreeWayMe account plugin"""
-    __author_name__ = ("Nicolas Giese")
-    __author_mail__ = ("james@free-way.me")
+    __author_name__ = "Nicolas Giese"
+    __author_mail__ = "james@free-way.me"
 
     def loadAccountInfo(self, user, req):
         status = self.getAccountStatus(user, req)
diff --git a/module/plugins/accounts/OverLoadMe.py b/module/plugins/accounts/OverLoadMe.py
index e288181eb..23ec10f7d 100644
--- a/module/plugins/accounts/OverLoadMe.py
+++ b/module/plugins/accounts/OverLoadMe.py
@@ -7,8 +7,8 @@ class OverLoadMe(Account):
     __version__ = "0.01"
     __type__ = "account"
     __description__ = """Over-Load.me account plugin"""
-    __author_name__ = ("marley")
-    __author_mail__ = ("marley@over-load.me")
+    __author_name__ = "marley"
+    __author_mail__ = "marley@over-load.me"
 
     def loadAccountInfo(self, user, req):
         data = self.getAccountData(user)
diff --git a/module/plugins/crypter/DailymotionBatch.py b/module/plugins/crypter/DailymotionBatch.py
index 1427bdc13..ad1cae67f 100644
--- a/module/plugins/crypter/DailymotionBatch.py
+++ b/module/plugins/crypter/DailymotionBatch.py
@@ -31,8 +31,8 @@ class DailymotionBatch(Crypter):
     __pattern__ = r"https?://(?:www\.)?dailymotion\.com/((playlists/)?(?P<TYPE>playlist|user)/)?(?P<ID>[\w^_]+)(?(TYPE)|#)"
     __version__ = "0.01"
     __description__ = """Dailymotion channel & playlist decrypter"""
-    __author_name__ = ("Walter Purcaro")
-    __author_mail__ = ("vuolter@gmail.com")
+    __author_name__ = "Walter Purcaro"
+    __author_mail__ = "vuolter@gmail.com"
 
     def api_response(self, ref, req=None):
         url = urljoin("https://api.dailymotion.com/", ref)
diff --git a/module/plugins/crypter/NosvideoCom.py b/module/plugins/crypter/NosvideoCom.py
index 49b932fc0..eae836038 100644
--- a/module/plugins/crypter/NosvideoCom.py
+++ b/module/plugins/crypter/NosvideoCom.py
@@ -8,6 +8,7 @@ class NosvideoCom(SimpleCrypter):
     __version__ = "0.01"
     __description__ = """Nosvideo.com Plugin"""
     __author_name__ = "igel"
+    __author_mail__ = "igelkun@myopera.com"
 
     LINK_PATTERN = r'href="(http://(?:w{3}\.)?nosupload.com/\?d=\w+)"'
     TITLE_PATTERN = r"<[tT]itle>Watch (?P<title>.+)</[tT]itle>"
diff --git a/module/plugins/crypter/TnyCz.py b/module/plugins/crypter/TnyCz.py
index d393507c7..444eb53f6 100644
--- a/module/plugins/crypter/TnyCz.py
+++ b/module/plugins/crypter/TnyCz.py
@@ -28,8 +28,8 @@ class TnyCz(SimpleCrypter):
     __pattern__ = r"http://(?:www\.)?tny\.cz/\w+"
     __version__ = "0.01"
     __description__ = """Tny.cz Plugin"""
-    __author_name__ = ("Walter Purcaro")
-    __author_mail__ = ("vuolter@gmail.com")
+    __author_name__ = "Walter Purcaro"
+    __author_mail__ = "vuolter@gmail.com"
 
     TITLE_PATTERN = r'<title>(?P<title>.+) - .+</title>'
 
diff --git a/module/plugins/hooks/FreeWayMe.py b/module/plugins/hooks/FreeWayMe.py
index 30d76cb8e..021ce2246 100644
--- a/module/plugins/hooks/FreeWayMe.py
+++ b/module/plugins/hooks/FreeWayMe.py
@@ -30,8 +30,8 @@ class FreeWayMe(MultiHoster):
                   ("hosterList", "str", "Hoster list (comma separated)", ""),
                   ("unloadFailing", "bool", "Revert to stanard download if download fails", "False"),
                   ("interval", "int", "Reload interval in hours (0 to disable)", "24")]
-    __author_name__ = ("Nicolas Giese")
-    __author_mail__ = ("james@free-way.me")
+    __author_name__ = "Nicolas Giese"
+    __author_mail__ = "james@free-way.me"
 
     def getHoster(self):
         hostis = getURL("https://www.free-way.me/ajax/jd.php", get={"id": 3}).replace("\"", "").strip()
diff --git a/module/plugins/hooks/OverLoadMe.py b/module/plugins/hooks/OverLoadMe.py
index bc8f9f5cb..09ceea3ad 100644
--- a/module/plugins/hooks/OverLoadMe.py
+++ b/module/plugins/hooks/OverLoadMe.py
@@ -15,8 +15,8 @@ class OverLoadMe(MultiHoster):
                   ("unloadFailing", "bool", "Revert to standard download if download fails", "False"),
                   ("interval", "int", "Reload interval in hours (0 to disable)", "12")]
     __description__ = """Over-Load.me hook plugin"""
-    __author_name__ = ("marley")
-    __author_email__ = ("marley@over-load.me")
+    __author_name__ = "marley"
+    __author_mail__ = "marley@over-load.me"
 
     def getHoster(self):
         https = "https" if self.getConfig("https") else "http"
diff --git a/module/plugins/hoster/FreeWayMe.py b/module/plugins/hoster/FreeWayMe.py
index 5439c10c1..2cb0d36c2 100644
--- a/module/plugins/hoster/FreeWayMe.py
+++ b/module/plugins/hoster/FreeWayMe.py
@@ -25,8 +25,8 @@ class FreeWayMe(Hoster):
     __type__ = "hoster"
     __pattern__ = r"https://free-way.me/.*"
     __description__ = """FreeWayMe hoster plugin"""
-    __author_name__ = ("Nicolas Giese")
-    __author_mail__ = ("james@free-way.me")
+    __author_name__ = "Nicolas Giese"
+    __author_mail__ = "james@free-way.me"
 
     def setup(self):
         self.resumeDownload = False
diff --git a/module/plugins/hoster/NosuploadCom.py b/module/plugins/hoster/NosuploadCom.py
index 5735390bb..f7e3d2657 100644
--- a/module/plugins/hoster/NosuploadCom.py
+++ b/module/plugins/hoster/NosuploadCom.py
@@ -12,6 +12,7 @@ class NosuploadCom(XFileSharingPro):
     __pattern__ = r"http://(?:www\.)?nosupload\.com/\?d=\w{12}"
     __description__ = """nosupload.com hoster plugin"""
     __author_name__ = "igel"
+    __author_mail__ = "igelkun@myopera.com"
 
     HOSTER_NAME = "nosupload.com"
 
diff --git a/module/plugins/hoster/OverLoadMe.py b/module/plugins/hoster/OverLoadMe.py
index 658b3940f..33c041973 100644
--- a/module/plugins/hoster/OverLoadMe.py
+++ b/module/plugins/hoster/OverLoadMe.py
@@ -15,8 +15,8 @@ class OverLoadMe(Hoster):
     __type__ = "hoster"
     __pattern__ = r"https?://.*overload\.me.*"
     __description__ = """Over-Load.me hoster plugin"""
-    __author_name__ = ("marley")
-    __author_mail__ = ("marley@over-load.me")
+    __author_name__ = "marley"
+    __author_mail__ = "marley@over-load.me"
 
     def getFilename(self, url):
         try:
diff --git a/module/plugins/hoster/SoundcloudCom.py b/module/plugins/hoster/SoundcloudCom.py
index 7e6d16236..6cccf4cab 100644
--- a/module/plugins/hoster/SoundcloudCom.py
+++ b/module/plugins/hoster/SoundcloudCom.py
@@ -12,8 +12,8 @@ class SoundcloudCom(Hoster):
     __pattern__ = r"https?://(?:www\.)?soundcloud\.com/(?P<UID>.*?)/(?P<SID>.*)"
     __version__ = "0.1"
     __description__ = """SoundCloud.com audio download hoster"""
-    __author_name__ = ("Peekayy")
-    __author_mail__ = ("peekayy.dev@gmail.com")
+    __author_name__ = "Peekayy"
+    __author_mail__ = "peekayy.dev@gmail.com"
 
     def process(self, pyfile):
         # default UserAgent of HTTPRequest fails for this hoster so we use this one