Fix EOF

Merges vuolter/pyload@00052b2

(cherry picked from commit 12485652a14c55e102e5d073f4bf9518f5cf5f85)

Conflicts:
	module/plugins/Container.py
	module/plugins/Crypter.py
	module/plugins/Hook.py
	module/plugins/PluginManager.py
	module/plugins/ReCaptcha.py
	pyload/plugins/accounts/MultishareCz.py

14 files changed, 10 insertions, 14 deletions

diff --git a/pyload/plugins/accounts/FastshareCz.py b/pyload/plugins/accounts/FastshareCz.py
index 44c4215ac..9b9173315 100644
--- a/pyload/plugins/accounts/FastshareCz.py
+++ b/pyload/plugins/accounts/FastshareCz.py
@@ -53,4 +53,4 @@ class FastshareCz(Account):
         }, decode=True)
 
         if u'>Špatné uživatelské jméno nebo heslo.<' in html:
-            self.wrongPassword()
\ No newline at end of file
+            self.wrongPassword()
diff --git a/pyload/plugins/addons/WindowsPhoneToastNotify.py b/pyload/plugins/addons/WindowsPhoneToastNotify.py
index d90b95f79..a769d0c5e 100644
--- a/pyload/plugins/addons/WindowsPhoneToastNotify.py
+++ b/pyload/plugins/addons/WindowsPhoneToastNotify.py
@@ -65,4 +65,3 @@ class WindowsPhoneToastNotify(Hook):
             return False
         
         self.doRequest()
-
diff --git a/pyload/plugins/crypter/CCF.py b/pyload/plugins/crypter/CCF.py
index 2bd42480d..0badf8e06 100644
--- a/pyload/plugins/crypter/CCF.py
+++ b/pyload/plugins/crypter/CCF.py
@@ -39,4 +39,3 @@ class CCF(Crypter):
         tempdlc.close()
 
         self.packages.append((tempdlc_name, [tempdlc_name], tempdlc_name))
-
diff --git a/pyload/plugins/crypter/CrockoComFolder.py b/pyload/plugins/crypter/CrockoComFolder.py
index 2b3b4af3c..f6778bb6f 100644
--- a/pyload/plugins/crypter/CrockoComFolder.py
+++ b/pyload/plugins/crypter/CrockoComFolder.py
@@ -12,4 +12,4 @@ class CrockoComFolder(SimpleCrypter):
     __author_name__ = "zoidberg"
     __author_mail__ = "zoidberg@mujmail.cz"
 
-    LINK_PATTERN = r'<td class="last"><a href="([^"]+)">download</a>'
\ No newline at end of file
+    LINK_PATTERN = r'<td class="last"><a href="([^"]+)">download</a>'
diff --git a/pyload/plugins/crypter/CzshareComFolder.py b/pyload/plugins/crypter/CzshareComFolder.py
index b908efc42..7cddcae6d 100644
--- a/pyload/plugins/crypter/CzshareComFolder.py
+++ b/pyload/plugins/crypter/CzshareComFolder.py
@@ -28,4 +28,4 @@ class CzshareComFolder(Crypter):
         if new_links:
             self.core.files.addLinks(new_links, self.pyfile.package().id)
         else:
-            self.fail('Could not extract any links')
\ No newline at end of file
+            self.fail('Could not extract any links')
diff --git a/pyload/plugins/crypter/FilebeerInfoFolder.py b/pyload/plugins/crypter/FilebeerInfoFolder.py
index 8a8dbd8ed..aaedf6eef 100644
--- a/pyload/plugins/crypter/FilebeerInfoFolder.py
+++ b/pyload/plugins/crypter/FilebeerInfoFolder.py
@@ -11,4 +11,3 @@ class FilebeerInfoFolder(DeadCrypter):
     __description__ = """Filebeer.info folder decrypter plugin"""
     __author_name__ = "zoidberg"
     __author_mail__ = "zoidberg@mujmail.cz"
-
diff --git a/pyload/plugins/crypter/QuickshareCzFolder.py b/pyload/plugins/crypter/QuickshareCzFolder.py
index c24034e8f..887d9c154 100644
--- a/pyload/plugins/crypter/QuickshareCzFolder.py
+++ b/pyload/plugins/crypter/QuickshareCzFolder.py
@@ -28,4 +28,4 @@ class QuickshareCzFolder(Crypter):
         if new_links:
             self.core.files.addLinks(new_links, self.pyfile.package().id)
         else:
-            self.fail('Could not extract any links')
\ No newline at end of file
+            self.fail('Could not extract any links')
diff --git a/pyload/plugins/crypter/RSDF.py b/pyload/plugins/crypter/RSDF.py
index 443eaff26..46de56d8f 100644
--- a/pyload/plugins/crypter/RSDF.py
+++ b/pyload/plugins/crypter/RSDF.py
@@ -46,4 +46,4 @@ class RSDF(Crypter):
                 links.append(decryptedUrl)
 
             self.log.debug("%s: adding package %s with %d links" % (self.__name__,pyfile.package().name,len(links)))
-            self.packages.append((pyfile.package().name, links))        
+            self.packages.append((pyfile.package().name, links))
diff --git a/pyload/plugins/hoster/DataportCz.py b/pyload/plugins/hoster/DataportCz.py
index 58ac39c73..ebd5d13a8 100644
--- a/pyload/plugins/hoster/DataportCz.py
+++ b/pyload/plugins/hoster/DataportCz.py
@@ -66,4 +66,4 @@ class DataportCz(SimpleHoster):
                 break
 
 
-create_getInfo(DataportCz)
\ No newline at end of file
+create_getInfo(DataportCz)
diff --git a/pyload/plugins/hoster/OneFichierCom.py b/pyload/plugins/hoster/OneFichierCom.py
index d358b9714..5b69db63d 100644
--- a/pyload/plugins/hoster/OneFichierCom.py
+++ b/pyload/plugins/hoster/OneFichierCom.py
@@ -77,4 +77,4 @@ class OneFichierCom(SimpleHoster):
         self.multiDL = self.premium
         self.resumeDownload = True
 
-getInfo = create_getInfo(OneFichierCom)   
+getInfo = create_getInfo(OneFichierCom)
diff --git a/pyload/plugins/hoster/Premium4Me.py b/pyload/plugins/hoster/Premium4Me.py
index b3920192c..ec76a7315 100644
--- a/pyload/plugins/hoster/Premium4Me.py
+++ b/pyload/plugins/hoster/Premium4Me.py
@@ -68,4 +68,4 @@ class Premium4Me(Hoster):
             traffic = int(self.load("http://premium.to/api/traffic.php?authcode=%s" % self.account.authcode))
         except:
             traffic = 0
-        return traffic       
+        return traffic
diff --git a/pyload/plugins/hoster/ShareRapidCom.py b/pyload/plugins/hoster/ShareRapidCom.py
index b14892a8f..7f1709865 100644
--- a/pyload/plugins/hoster/ShareRapidCom.py
+++ b/pyload/plugins/hoster/ShareRapidCom.py
@@ -68,4 +68,4 @@ class ShareRapidCom(SimpleHoster):
             elif re.search(self.ERR_CREDIT_PATTERN, self.html):
                 self.fail("Not enough credit left")
             else:
-                self.fail("Download link not found")           
+                self.fail("Download link not found")
diff --git a/pyload/plugins/hoster/StreamCz.py b/pyload/plugins/hoster/StreamCz.py
index 79d9740ef..93627823e 100644
--- a/pyload/plugins/hoster/StreamCz.py
+++ b/pyload/plugins/hoster/StreamCz.py
@@ -78,4 +78,4 @@ class StreamCz(Hoster):
 
         download_url = "http://cdn-dispatcher.stream.cz/?id=" + cdnid
         self.logInfo("STREAM (%s): %s" % (cdnkey[-2:], download_url))
-        self.download(download_url)         
+        self.download(download_url)
diff --git a/pyload/plugins/internal/OCR.py b/pyload/plugins/internal/OCR.py
index c30125a03..98f71d571 100644
--- a/pyload/plugins/internal/OCR.py
+++ b/pyload/plugins/internal/OCR.py
@@ -311,4 +311,3 @@ if __name__ == '__main__':
     ocr.run_tesser()
     print "Tesseract", ocr.result_captcha
     ocr.image.save("derotated.jpg")
-