From 23d0f33faa538dcdcb211561aa758e7eef9f8b45 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 11 Apr 2014 12:24:27 +0200 Subject: Fix header # -*- coding: utf-8 -*- Merges vuolter/pyload@aa7b3f9 (cherry picked from commit 5fed2b0180b95eed9ee82f82dff1a5bf8c66c2f5) Conflicts: module/plugins/AccountManager.py module/plugins/ReCaptcha.py module/plugins/captcha/GigasizeCom.py module/plugins/captcha/LinksaveIn.py module/plugins/container/LinkList.py module/plugins/hooks/MultiDebridCom.py module/plugins/hooks/UnrestrictLi.py module/plugins/internal/MultiHoster.py pyload/plugins/accounts/Premium4Me.py pyload/plugins/accounts/PremiumizeMe.py pyload/plugins/internal/NetloadInOCR.py --- pyload/plugins/accounts/AlldebridCom.py | 2 ++ pyload/plugins/accounts/CramitIn.py | 1 + pyload/plugins/accounts/CyberlockerCh.py | 1 + pyload/plugins/accounts/DdlstorageCom.py | 1 + pyload/plugins/accounts/DebridItaliaCom.py | 1 - pyload/plugins/accounts/FastixRu.py | 2 ++ pyload/plugins/accounts/FilefactoryCom.py | 1 - pyload/plugins/accounts/FilerNet.py | 1 - pyload/plugins/accounts/FilerioCom.py | 1 + pyload/plugins/accounts/LetitbitNet.py | 1 - pyload/plugins/accounts/MultiDebridCom.py | 1 - pyload/plugins/accounts/RPNetBiz.py | 2 ++ pyload/plugins/accounts/RarefileNet.py | 1 + pyload/plugins/accounts/RealdebridCom.py | 2 ++ pyload/plugins/accounts/RehostTo.py | 2 ++ pyload/plugins/accounts/ReloadCc.py | 2 ++ pyload/plugins/accounts/RyushareCom.py | 1 + pyload/plugins/accounts/SimplydebridCom.py | 1 + pyload/plugins/accounts/UnrestrictLi.py | 1 - pyload/plugins/accounts/UploadheroCom.py | 1 - pyload/plugins/accounts/UptoboxCom.py | 1 + pyload/plugins/accounts/ZeveraCom.py | 1 + 22 files changed, 21 insertions(+), 7 deletions(-) (limited to 'pyload/plugins/accounts') diff --git a/pyload/plugins/accounts/AlldebridCom.py b/pyload/plugins/accounts/AlldebridCom.py index a0a518ce1..69c12633d 100644 --- a/pyload/plugins/accounts/AlldebridCom.py +++ b/pyload/plugins/accounts/AlldebridCom.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + import xml.dom.minidom as dom from time import time import re diff --git a/pyload/plugins/accounts/CramitIn.py b/pyload/plugins/accounts/CramitIn.py index 3b43448b2..56cb5390b 100644 --- a/pyload/plugins/accounts/CramitIn.py +++ b/pyload/plugins/accounts/CramitIn.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- + from module.plugins.internal.XFSPAccount import XFSPAccount diff --git a/pyload/plugins/accounts/CyberlockerCh.py b/pyload/plugins/accounts/CyberlockerCh.py index d33ce41a9..4f3189b0c 100644 --- a/pyload/plugins/accounts/CyberlockerCh.py +++ b/pyload/plugins/accounts/CyberlockerCh.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- + from module.plugins.internal.XFSPAccount import XFSPAccount from module.plugins.internal.SimpleHoster import parseHtmlForm diff --git a/pyload/plugins/accounts/DdlstorageCom.py b/pyload/plugins/accounts/DdlstorageCom.py index 08ff537da..f3eebc59b 100644 --- a/pyload/plugins/accounts/DdlstorageCom.py +++ b/pyload/plugins/accounts/DdlstorageCom.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- + from hashlib import md5 from time import mktime, strptime diff --git a/pyload/plugins/accounts/DebridItaliaCom.py b/pyload/plugins/accounts/DebridItaliaCom.py index bc5734113..1d27d7dd0 100644 --- a/pyload/plugins/accounts/DebridItaliaCom.py +++ b/pyload/plugins/accounts/DebridItaliaCom.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- - ############################################################################ # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU Affero General Public License as # diff --git a/pyload/plugins/accounts/FastixRu.py b/pyload/plugins/accounts/FastixRu.py index 14ac6ef70..dbfd1f33e 100644 --- a/pyload/plugins/accounts/FastixRu.py +++ b/pyload/plugins/accounts/FastixRu.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + from module.plugins.Account import Account from module.common.json_layer import json_loads diff --git a/pyload/plugins/accounts/FilefactoryCom.py b/pyload/plugins/accounts/FilefactoryCom.py index bbb606aa2..0eded0edf 100644 --- a/pyload/plugins/accounts/FilefactoryCom.py +++ b/pyload/plugins/accounts/FilefactoryCom.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- - ############################################################################ # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU Affero General Public License as # diff --git a/pyload/plugins/accounts/FilerNet.py b/pyload/plugins/accounts/FilerNet.py index 66988c338..28ddf2e3f 100644 --- a/pyload/plugins/accounts/FilerNet.py +++ b/pyload/plugins/accounts/FilerNet.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- - ############################################################################ # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU Affero General Public License as # diff --git a/pyload/plugins/accounts/FilerioCom.py b/pyload/plugins/accounts/FilerioCom.py index 61626c317..5f2164cf1 100644 --- a/pyload/plugins/accounts/FilerioCom.py +++ b/pyload/plugins/accounts/FilerioCom.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- + from module.plugins.internal.XFSPAccount import XFSPAccount diff --git a/pyload/plugins/accounts/LetitbitNet.py b/pyload/plugins/accounts/LetitbitNet.py index 9e2f570b3..e37c860a6 100644 --- a/pyload/plugins/accounts/LetitbitNet.py +++ b/pyload/plugins/accounts/LetitbitNet.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- - ############################################################################ # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU Affero General Public License as # diff --git a/pyload/plugins/accounts/MultiDebridCom.py b/pyload/plugins/accounts/MultiDebridCom.py index 0c7b1d230..63936e443 100644 --- a/pyload/plugins/accounts/MultiDebridCom.py +++ b/pyload/plugins/accounts/MultiDebridCom.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- - ############################################################################ # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU Affero General Public License as # diff --git a/pyload/plugins/accounts/RPNetBiz.py b/pyload/plugins/accounts/RPNetBiz.py index 6c5b76653..49a294d14 100644 --- a/pyload/plugins/accounts/RPNetBiz.py +++ b/pyload/plugins/accounts/RPNetBiz.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + from module.plugins.Account import Account from module.common.json_layer import json_loads diff --git a/pyload/plugins/accounts/RarefileNet.py b/pyload/plugins/accounts/RarefileNet.py index c79bc2cc5..494941aef 100644 --- a/pyload/plugins/accounts/RarefileNet.py +++ b/pyload/plugins/accounts/RarefileNet.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- + from module.plugins.internal.XFSPAccount import XFSPAccount diff --git a/pyload/plugins/accounts/RealdebridCom.py b/pyload/plugins/accounts/RealdebridCom.py index f0be58719..1b61b0342 100644 --- a/pyload/plugins/accounts/RealdebridCom.py +++ b/pyload/plugins/accounts/RealdebridCom.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + import xml.dom.minidom as dom from pyload.plugins.MultiHoster import MultiHoster diff --git a/pyload/plugins/accounts/RehostTo.py b/pyload/plugins/accounts/RehostTo.py index f040ddbb1..c4aa85484 100644 --- a/pyload/plugins/accounts/RehostTo.py +++ b/pyload/plugins/accounts/RehostTo.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + from module.plugins.Account import Account diff --git a/pyload/plugins/accounts/ReloadCc.py b/pyload/plugins/accounts/ReloadCc.py index aead6544f..af23d9936 100644 --- a/pyload/plugins/accounts/ReloadCc.py +++ b/pyload/plugins/accounts/ReloadCc.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + from module.plugins.Account import Account from module.common.json_layer import json_loads diff --git a/pyload/plugins/accounts/RyushareCom.py b/pyload/plugins/accounts/RyushareCom.py index 1300659ee..6a15c4c82 100644 --- a/pyload/plugins/accounts/RyushareCom.py +++ b/pyload/plugins/accounts/RyushareCom.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- + from module.plugins.internal.XFSPAccount import XFSPAccount diff --git a/pyload/plugins/accounts/SimplydebridCom.py b/pyload/plugins/accounts/SimplydebridCom.py index e1c432860..9021c06ef 100644 --- a/pyload/plugins/accounts/SimplydebridCom.py +++ b/pyload/plugins/accounts/SimplydebridCom.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- + from time import mktime, strptime from pyload.plugins.MultiHoster import MultiHoster diff --git a/pyload/plugins/accounts/UnrestrictLi.py b/pyload/plugins/accounts/UnrestrictLi.py index 1c5263e28..1f975f494 100644 --- a/pyload/plugins/accounts/UnrestrictLi.py +++ b/pyload/plugins/accounts/UnrestrictLi.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- - ############################################################################ # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU Affero General Public License as # diff --git a/pyload/plugins/accounts/UploadheroCom.py b/pyload/plugins/accounts/UploadheroCom.py index d6f35472a..8adcff4ac 100644 --- a/pyload/plugins/accounts/UploadheroCom.py +++ b/pyload/plugins/accounts/UploadheroCom.py @@ -1,4 +1,3 @@ - # -*- coding: utf-8 -*- import re diff --git a/pyload/plugins/accounts/UptoboxCom.py b/pyload/plugins/accounts/UptoboxCom.py index 0215254bd..3757ae0aa 100644 --- a/pyload/plugins/accounts/UptoboxCom.py +++ b/pyload/plugins/accounts/UptoboxCom.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- + from module.plugins.internal.XFSPAccount import XFSPAccount diff --git a/pyload/plugins/accounts/ZeveraCom.py b/pyload/plugins/accounts/ZeveraCom.py index dcba478df..c7e3737a5 100644 --- a/pyload/plugins/accounts/ZeveraCom.py +++ b/pyload/plugins/accounts/ZeveraCom.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- + from time import mktime, strptime from pyload.plugins.MultiHoster import MultiHoster -- cgit v1.2.3