From 8dbe6073781bb0e9425f17cd5e7ce7bf525f20c6 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 11 Apr 2014 11:50:52 +0200 Subject: 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 --- module/plugins/crypter/DailymotionBatch.py | 4 ++-- module/plugins/crypter/NosvideoCom.py | 1 + module/plugins/crypter/TnyCz.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'module/plugins/crypter') 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/)?(?Pplaylist|user)/)?(?P[\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.+)</[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>.+) - .+' -- cgit v1.2.3