summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@gmail.com> 2014-04-11 12:18:22 +0200
committerGravatar Stefano <l.stickell@yahoo.it> 2014-04-21 17:20:41 +0200
commit2069392beb3e8175c3bb7118535ef4475817d420 (patch)
treeeade5e6edec1d14a905863367b34c8f2e0cf0171
parentUse wait to set time in SimpleHoster plugins (diff)
downloadpyload-2069392beb3e8175c3bb7118535ef4475817d420.tar.xz
Remove bad whitespaces
Merges vuolter/pyload@e4b2562 (cherry picked from commit d68938a9a7fbfb079b0a6de469de766b5892d769) Conflicts: module/plugins/Account.py module/plugins/AccountManager.py module/plugins/Container.py module/plugins/Crypter.py module/plugins/Hook.py module/plugins/Hoster.py module/plugins/Plugin.py module/plugins/PluginManager.py module/plugins/ReCaptcha.py module/plugins/captcha/GigasizeCom.py module/plugins/captcha/LinksaveIn.py module/plugins/container/LinkList.py pyload/plugins/internal/OCR.py pyload/plugins/internal/ShareonlineBizOCR.py
-rw-r--r--pyload/plugins/accounts/BayfilesCom.py2
-rw-r--r--pyload/plugins/accounts/CzshareCom.py2
-rw-r--r--pyload/plugins/accounts/DepositfilesCom.py2
-rw-r--r--pyload/plugins/accounts/EasybytezCom.py2
-rw-r--r--pyload/plugins/accounts/EuroshareEu.py2
-rw-r--r--pyload/plugins/accounts/FastshareCz.py2
-rw-r--r--pyload/plugins/accounts/FilecloudIo.py2
-rw-r--r--pyload/plugins/accounts/FilejungleCom.py2
-rw-r--r--pyload/plugins/accounts/FileserveCom.py2
-rw-r--r--pyload/plugins/accounts/FourSharedCom.py2
-rw-r--r--pyload/plugins/accounts/HotfileCom.py2
-rw-r--r--pyload/plugins/accounts/MultishareCz.py2
-rwxr-xr-xpyload/plugins/accounts/NetloadIn.py2
-rw-r--r--pyload/plugins/accounts/QuickshareCz.py2
-rw-r--r--pyload/plugins/accounts/RapidgatorNet.py2
-rw-r--r--pyload/plugins/accounts/RapidshareCom.py2
-rw-r--r--pyload/plugins/accounts/ShareonlineBiz.py2
-rw-r--r--pyload/plugins/accounts/StahnuTo.py2
-rw-r--r--pyload/plugins/accounts/TurbobitNet.py2
-rw-r--r--pyload/plugins/accounts/UploadedTo.py2
-rw-r--r--pyload/plugins/accounts/UploadingCom.py2
-rw-r--r--pyload/plugins/accounts/WarserverCz.py2
-rw-r--r--pyload/plugins/addons/ClickAndLoad.py2
-rw-r--r--pyload/plugins/addons/DownloadScheduler.py2
-rw-r--r--pyload/plugins/addons/HotFolder.py2
-rw-r--r--pyload/plugins/addons/IRCInterface.py2
-rw-r--r--pyload/plugins/addons/MergeFiles.py2
-rw-r--r--pyload/plugins/addons/MultiHome.py2
-rw-r--r--pyload/plugins/addons/WindowsPhoneToastNotify.py6
-rw-r--r--pyload/plugins/crypter/CCF.py4
-rw-r--r--pyload/plugins/crypter/RSDF.py3
-rw-r--r--pyload/plugins/hoster/Ftp.py2
-rw-r--r--pyload/plugins/hoster/MovReelCom.py2
-rw-r--r--pyload/plugins/hoster/Xdcc.py2
-rw-r--r--pyload/plugins/internal/NetloadInOCR.py4
35 files changed, 39 insertions, 40 deletions
diff --git a/pyload/plugins/accounts/BayfilesCom.py b/pyload/plugins/accounts/BayfilesCom.py
index d9330158a..9aaa08a12 100644
--- a/pyload/plugins/accounts/BayfilesCom.py
+++ b/pyload/plugins/accounts/BayfilesCom.py
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
-
+
@author: zoidberg
"""
diff --git a/pyload/plugins/accounts/CzshareCom.py b/pyload/plugins/accounts/CzshareCom.py
index 188ee74e9..fc0b98793 100644
--- a/pyload/plugins/accounts/CzshareCom.py
+++ b/pyload/plugins/accounts/CzshareCom.py
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
-
+
@author: zoidberg
"""
diff --git a/pyload/plugins/accounts/DepositfilesCom.py b/pyload/plugins/accounts/DepositfilesCom.py
index d75c9b729..427f5c34d 100644
--- a/pyload/plugins/accounts/DepositfilesCom.py
+++ b/pyload/plugins/accounts/DepositfilesCom.py
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
-
+
@author: mkaay
"""
diff --git a/pyload/plugins/accounts/EasybytezCom.py b/pyload/plugins/accounts/EasybytezCom.py
index b14031779..16ce674e2 100644
--- a/pyload/plugins/accounts/EasybytezCom.py
+++ b/pyload/plugins/accounts/EasybytezCom.py
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
-
+
@author: zoidberg
"""
diff --git a/pyload/plugins/accounts/EuroshareEu.py b/pyload/plugins/accounts/EuroshareEu.py
index 223d3fcf6..3fb0d7f50 100644
--- a/pyload/plugins/accounts/EuroshareEu.py
+++ b/pyload/plugins/accounts/EuroshareEu.py
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
-
+
@author: zoidberg
"""
diff --git a/pyload/plugins/accounts/FastshareCz.py b/pyload/plugins/accounts/FastshareCz.py
index 9b9173315..ba6105e6e 100644
--- a/pyload/plugins/accounts/FastshareCz.py
+++ b/pyload/plugins/accounts/FastshareCz.py
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
-
+
@author: zoidberg
"""
diff --git a/pyload/plugins/accounts/FilecloudIo.py b/pyload/plugins/accounts/FilecloudIo.py
index 15e1d90be..f2becb8c9 100644
--- a/pyload/plugins/accounts/FilecloudIo.py
+++ b/pyload/plugins/accounts/FilecloudIo.py
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
-
+
@author: zoidberg
"""
diff --git a/pyload/plugins/accounts/FilejungleCom.py b/pyload/plugins/accounts/FilejungleCom.py
index 42b45625c..304f20040 100644
--- a/pyload/plugins/accounts/FilejungleCom.py
+++ b/pyload/plugins/accounts/FilejungleCom.py
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
-
+
@author: zoidberg
"""
diff --git a/pyload/plugins/accounts/FileserveCom.py b/pyload/plugins/accounts/FileserveCom.py
index 439e4cd81..266935a9f 100644
--- a/pyload/plugins/accounts/FileserveCom.py
+++ b/pyload/plugins/accounts/FileserveCom.py
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
-
+
@author: mkaay
"""
diff --git a/pyload/plugins/accounts/FourSharedCom.py b/pyload/plugins/accounts/FourSharedCom.py
index e8c8c5bd6..869705313 100644
--- a/pyload/plugins/accounts/FourSharedCom.py
+++ b/pyload/plugins/accounts/FourSharedCom.py
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
-
+
@author: zoidberg
"""
diff --git a/pyload/plugins/accounts/HotfileCom.py b/pyload/plugins/accounts/HotfileCom.py
index 7188e6758..f6988542f 100644
--- a/pyload/plugins/accounts/HotfileCom.py
+++ b/pyload/plugins/accounts/HotfileCom.py
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
-
+
@author: mkaay, JoKoT3
"""
diff --git a/pyload/plugins/accounts/MultishareCz.py b/pyload/plugins/accounts/MultishareCz.py
index 749400fa7..588f2d13a 100644
--- a/pyload/plugins/accounts/MultishareCz.py
+++ b/pyload/plugins/accounts/MultishareCz.py
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
-
+
@author: zoidberg
"""
diff --git a/pyload/plugins/accounts/NetloadIn.py b/pyload/plugins/accounts/NetloadIn.py
index d71fba070..3d2b52470 100755
--- a/pyload/plugins/accounts/NetloadIn.py
+++ b/pyload/plugins/accounts/NetloadIn.py
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
-
+
@author: mkaay
"""
diff --git a/pyload/plugins/accounts/QuickshareCz.py b/pyload/plugins/accounts/QuickshareCz.py
index 356ed23c8..5a69a7f66 100644
--- a/pyload/plugins/accounts/QuickshareCz.py
+++ b/pyload/plugins/accounts/QuickshareCz.py
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
-
+
@author: zoidberg
"""
diff --git a/pyload/plugins/accounts/RapidgatorNet.py b/pyload/plugins/accounts/RapidgatorNet.py
index 8fcd0c95a..c008a0db3 100644
--- a/pyload/plugins/accounts/RapidgatorNet.py
+++ b/pyload/plugins/accounts/RapidgatorNet.py
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
-
+
@author: zoidberg
"""
diff --git a/pyload/plugins/accounts/RapidshareCom.py b/pyload/plugins/accounts/RapidshareCom.py
index bc41ac5e1..17d7f0e08 100644
--- a/pyload/plugins/accounts/RapidshareCom.py
+++ b/pyload/plugins/accounts/RapidshareCom.py
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
-
+
@author: mkaay
"""
diff --git a/pyload/plugins/accounts/ShareonlineBiz.py b/pyload/plugins/accounts/ShareonlineBiz.py
index 6ab1492c2..f188fc580 100644
--- a/pyload/plugins/accounts/ShareonlineBiz.py
+++ b/pyload/plugins/accounts/ShareonlineBiz.py
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
-
+
@author: mkaay
"""
diff --git a/pyload/plugins/accounts/StahnuTo.py b/pyload/plugins/accounts/StahnuTo.py
index e371a89b1..529e2131f 100644
--- a/pyload/plugins/accounts/StahnuTo.py
+++ b/pyload/plugins/accounts/StahnuTo.py
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
-
+
@author: zoidberg
"""
diff --git a/pyload/plugins/accounts/TurbobitNet.py b/pyload/plugins/accounts/TurbobitNet.py
index 73615b13a..19ffaf1e5 100644
--- a/pyload/plugins/accounts/TurbobitNet.py
+++ b/pyload/plugins/accounts/TurbobitNet.py
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
-
+
@author: zoidberg
"""
diff --git a/pyload/plugins/accounts/UploadedTo.py b/pyload/plugins/accounts/UploadedTo.py
index b6058115b..02f31c544 100644
--- a/pyload/plugins/accounts/UploadedTo.py
+++ b/pyload/plugins/accounts/UploadedTo.py
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
-
+
@author: mkaay
"""
diff --git a/pyload/plugins/accounts/UploadingCom.py b/pyload/plugins/accounts/UploadingCom.py
index 665c6346f..f0395c13a 100644
--- a/pyload/plugins/accounts/UploadingCom.py
+++ b/pyload/plugins/accounts/UploadingCom.py
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
-
+
@author: mkaay
"""
diff --git a/pyload/plugins/accounts/WarserverCz.py b/pyload/plugins/accounts/WarserverCz.py
index 62c7e19fa..a5acf5e52 100644
--- a/pyload/plugins/accounts/WarserverCz.py
+++ b/pyload/plugins/accounts/WarserverCz.py
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
-
+
@author: zoidberg
"""
diff --git a/pyload/plugins/addons/ClickAndLoad.py b/pyload/plugins/addons/ClickAndLoad.py
index 0030ad09d..66ebd2146 100644
--- a/pyload/plugins/addons/ClickAndLoad.py
+++ b/pyload/plugins/addons/ClickAndLoad.py
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
-
+
@author: RaNaN
@interface-version: 0.2
"""
diff --git a/pyload/plugins/addons/DownloadScheduler.py b/pyload/plugins/addons/DownloadScheduler.py
index 0104ab7c9..41a20e5d1 100644
--- a/pyload/plugins/addons/DownloadScheduler.py
+++ b/pyload/plugins/addons/DownloadScheduler.py
@@ -11,7 +11,7 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
-
+
@author: zoidberg
Original idea by new.cze
"""
diff --git a/pyload/plugins/addons/HotFolder.py b/pyload/plugins/addons/HotFolder.py
index 82c054902..38bcaf440 100644
--- a/pyload/plugins/addons/HotFolder.py
+++ b/pyload/plugins/addons/HotFolder.py
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
-
+
@author: RaNaN
@interface-version: 0.2
"""
diff --git a/pyload/plugins/addons/IRCInterface.py b/pyload/plugins/addons/IRCInterface.py
index 683e6208e..4272a81c7 100644
--- a/pyload/plugins/addons/IRCInterface.py
+++ b/pyload/plugins/addons/IRCInterface.py
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
-
+
@author: RaNaN
@author: jeix
@interface-version: 0.2
diff --git a/pyload/plugins/addons/MergeFiles.py b/pyload/plugins/addons/MergeFiles.py
index 687017a4b..99b0aafc6 100644
--- a/pyload/plugins/addons/MergeFiles.py
+++ b/pyload/plugins/addons/MergeFiles.py
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
-
+
@author: and9000
"""
diff --git a/pyload/plugins/addons/MultiHome.py b/pyload/plugins/addons/MultiHome.py
index 67be26b79..b1635a588 100644
--- a/pyload/plugins/addons/MultiHome.py
+++ b/pyload/plugins/addons/MultiHome.py
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
-
+
@author: mkaay
"""
diff --git a/pyload/plugins/addons/WindowsPhoneToastNotify.py b/pyload/plugins/addons/WindowsPhoneToastNotify.py
index a769d0c5e..a9772e766 100644
--- a/pyload/plugins/addons/WindowsPhoneToastNotify.py
+++ b/pyload/plugins/addons/WindowsPhoneToastNotify.py
@@ -32,7 +32,7 @@ class WindowsPhoneToastNotify(Hook):
def setup(self):
self.info = {}
-
+
def getXmlData(self):
myxml = ("<?xml version='1.0' encoding='utf-8'?> <wp:Notification xmlns:wp='WPNotification'> "
"<wp:Toast> <wp:Text1>Pyload Mobile</wp:Text1> <wp:Text2>Captcha waiting!</wp:Text2> "
@@ -60,8 +60,8 @@ class WindowsPhoneToastNotify(Hook):
if self.core.isClientConnected() and not self.getConfig("force"):
return False
-
+
if (time.time() - float(self.getStorage("LAST_NOTIFY", 0))) < self.getConf("pushTimeout"):
return False
-
+
self.doRequest()
diff --git a/pyload/plugins/crypter/CCF.py b/pyload/plugins/crypter/CCF.py
index 0badf8e06..f2b33561e 100644
--- a/pyload/plugins/crypter/CCF.py
+++ b/pyload/plugins/crypter/CCF.py
@@ -19,7 +19,7 @@ class CCF(Crypter):
__author_mail__ = "Willnix@pyload.org"
def decrypt(self, pyfile):
-
+
infile = pyfile.url.replace("\n", "")
opener = build_opener(MultipartPostHandler)
@@ -32,7 +32,7 @@ class CCF(Crypter):
location = download_folder #join(download_folder, self.pyfile.package().folder.decode(sys.getfilesystemencoding()))
if not exists(location):
makedirs(location)
-
+
tempdlc_name = join(location, "tmp_%s.dlc" % pyfile.name)
tempdlc = open(tempdlc_name, "w")
tempdlc.write(re.search(r'<dlc>(.*)</dlc>', tempdlc_content, re.DOTALL).group(1))
diff --git a/pyload/plugins/crypter/RSDF.py b/pyload/plugins/crypter/RSDF.py
index 46de56d8f..6440585bc 100644
--- a/pyload/plugins/crypter/RSDF.py
+++ b/pyload/plugins/crypter/RSDF.py
@@ -15,9 +15,8 @@ class RSDF(Crypter):
__author_name__ = ("RaNaN", "spoob")
__author_mail__ = ("RaNaN@pyload.org", "spoob@pyload.org")
-
def decrypt(self, pyfile):
-
+
from Crypto.Cipher import AES
infile = pyfile.url.replace("\n", "")
diff --git a/pyload/plugins/hoster/Ftp.py b/pyload/plugins/hoster/Ftp.py
index 2058d21d6..af9191a4d 100644
--- a/pyload/plugins/hoster/Ftp.py
+++ b/pyload/plugins/hoster/Ftp.py
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
-
+
@author: jeix
@author: mkaay
"""
diff --git a/pyload/plugins/hoster/MovReelCom.py b/pyload/plugins/hoster/MovReelCom.py
index d100a6c66..b2393c60b 100644
--- a/pyload/plugins/hoster/MovReelCom.py
+++ b/pyload/plugins/hoster/MovReelCom.py
@@ -19,5 +19,5 @@ class MovReelCom(XFileSharingPro):
DIRECT_LINK_PATTERN = r'<a href="(http://[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*/.*)">Download Link</a>'
#OVR_DOWNLOAD_LINK_PATTERN = "var file_link = '(.*)';"
HOSTER_NAME = "movreel.com"
-
+
getInfo = create_getInfo(MovReelCom)
diff --git a/pyload/plugins/hoster/Xdcc.py b/pyload/plugins/hoster/Xdcc.py
index 43f0dd656..5a5422cef 100644
--- a/pyload/plugins/hoster/Xdcc.py
+++ b/pyload/plugins/hoster/Xdcc.py
@@ -13,7 +13,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
-
+
@author: jeix
"""
diff --git a/pyload/plugins/internal/NetloadInOCR.py b/pyload/plugins/internal/NetloadInOCR.py
index e50978701..6f2f6d166 100644
--- a/pyload/plugins/internal/NetloadInOCR.py
+++ b/pyload/plugins/internal/NetloadInOCR.py
@@ -14,9 +14,9 @@ class NetloadInOCR(OCR):
self.clean(3)
self.clean(3)
self.run_tesser(True, True, False, False)
-
+
self.result_captcha = self.result_captcha.replace(" ", "")[:4] # cut to 4 numbers
-
+
return self.result_captcha
if __name__ == '__main__':