From 37d898f681e41fe9c9a8719a540eda59bfedd448 Mon Sep 17 00:00:00 2001
From: Stefano <l.stickell@yahoo.it>
Date: Sun, 21 Jul 2013 12:58:42 +0200
Subject: Normalize line endings to avoid line endings merge conflicts

---
 module/plugins/hoster/UploadStationCom.py | 40 +++++++++++++++----------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'module/plugins/hoster/UploadStationCom.py')

diff --git a/module/plugins/hoster/UploadStationCom.py b/module/plugins/hoster/UploadStationCom.py
index d24682e4d..96dc7b577 100644
--- a/module/plugins/hoster/UploadStationCom.py
+++ b/module/plugins/hoster/UploadStationCom.py
@@ -1,21 +1,21 @@
-# -*- coding: utf-8 -*-
-from module.plugins.hoster.FileserveCom import FileserveCom, checkFile
-from module.plugins.Plugin import chunks
-
-class UploadStationCom(FileserveCom):
-    __name__ = "UploadStationCom"
-    __type__ = "hoster"
-    __pattern__ = r"http://(?:www\.)?uploadstation\.com/file/(?P<id>[A-Za-z0-9]+)"
-    __version__ = "0.51"
-    __description__ = """UploadStation.Com File Download Hoster"""
-    __author_name__ = ("fragonib", "zoidberg")
-    __author_mail__ = ("fragonib[AT]yahoo[DOT]es", "zoidberg@mujmail.cz")
-            
-    URLS = ['http://www.uploadstation.com/file/', 'http://www.uploadstation.com/check-links.php', 'http://www.uploadstation.com/checkReCaptcha.php']
-    LINKCHECK_TR = r'<div class="details (?:white|grey)">(.*?)\t{9}</div>'
-    LINKCHECK_TD = r'<div class="(?:col )?col\d">(?:<[^>]*>|&nbsp;)*([^<]*)'
-    
-    LONG_WAIT_PATTERN = r'<h1>You have to wait (\d+) (\w+) to download the next file\.</h1>'
-   
-def getInfo(urls):
+# -*- coding: utf-8 -*-
+from module.plugins.hoster.FileserveCom import FileserveCom, checkFile
+from module.plugins.Plugin import chunks
+
+class UploadStationCom(FileserveCom):
+    __name__ = "UploadStationCom"
+    __type__ = "hoster"
+    __pattern__ = r"http://(?:www\.)?uploadstation\.com/file/(?P<id>[A-Za-z0-9]+)"
+    __version__ = "0.51"
+    __description__ = """UploadStation.Com File Download Hoster"""
+    __author_name__ = ("fragonib", "zoidberg")
+    __author_mail__ = ("fragonib[AT]yahoo[DOT]es", "zoidberg@mujmail.cz")
+            
+    URLS = ['http://www.uploadstation.com/file/', 'http://www.uploadstation.com/check-links.php', 'http://www.uploadstation.com/checkReCaptcha.php']
+    LINKCHECK_TR = r'<div class="details (?:white|grey)">(.*?)\t{9}</div>'
+    LINKCHECK_TD = r'<div class="(?:col )?col\d">(?:<[^>]*>|&nbsp;)*([^<]*)'
+    
+    LONG_WAIT_PATTERN = r'<h1>You have to wait (\d+) (\w+) to download the next file\.</h1>'
+   
+def getInfo(urls):
     for chunk in chunks(urls, 100): yield checkFile(UploadStationCom, chunk) 
\ No newline at end of file
-- 
cgit v1.2.3