cleanup

4 files changed, 5 insertions, 6 deletions

diff --git a/module/plugins/hoster/NetloadIn.py b/module/plugins/hoster/NetloadIn.py
index dc5d2a028..9735a430d 100644
--- a/module/plugins/hoster/NetloadIn.py
+++ b/module/plugins/hoster/NetloadIn.py
@@ -116,7 +116,7 @@ class NetloadIn(Hoster):
                 self.api_data["exists"] = False
         else:
             self.api_data = False
-            self.html[0] = self.load(self.url, cookies=False)
+            self.html = [self.load(self.url, cookies=False)]
 
     def final_wait(self, page):
         wait_time = self.get_wait_time(page)
diff --git a/module/plugins/hoster/RapidshareCom.py b/module/plugins/hoster/RapidshareCom.py
index 3dfc6d465..cc3101529 100644
--- a/module/plugins/hoster/RapidshareCom.py
+++ b/module/plugins/hoster/RapidshareCom.py
@@ -153,7 +153,7 @@ class RapidshareCom(Hoster):
             if re.search(r"(Currently a lot of users|no more download slots|servers are overloaded)", self.html[1], re.I) is not None:
                 self.log.info(_("Rapidshare: No free slots!"))
                 self.no_slots = True
-                return time() + 130
+                return 130
             self.no_slots = False
             wait_seconds = re.search(r"var c=(.*);.*", self.html[1]).group(1)
             return int(wait_seconds) + 5
@@ -164,7 +164,7 @@ class RapidshareCom(Hoster):
         if self.getConf('server') == "None":
             file_url_pattern = r".*name=\"dlf\" action=\"(.*)\" method=.*"
         else:
-            file_url_pattern = '(http://rs.*)\';" /> %s<br />' % getConf('server')
+            file_url_pattern = '(http://rs.*)\';" /> %s<br />' % self.getConf('server')
 
         return re.search(file_url_pattern, self.html[1]).group(1)
 
diff --git a/module/plugins/hoster/StorageTo.py b/module/plugins/hoster/StorageTo.py
index f0660b40d..49957ba89 100644
--- a/module/plugins/hoster/StorageTo.py
+++ b/module/plugins/hoster/StorageTo.py
@@ -50,11 +50,11 @@ class StorageTo(Hoster):
         return True
     
     def download_html(self):
-        url = self.parent.url
+        url = self.pyfile.url
         self.html = self.load(url, cookies=True)
 
     def download_api_data(self):
-        url = self.parent.url
+        url = self.pyfile.url
         info_url = url.replace("/get/", "/getlink/")
         src = self.load(info_url, cookies=True)
         pattern = re.compile(r"'(\w+)' : (.*?)[,|\}]")
diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py
index f04e97531..70d71b493 100644
--- a/module/plugins/hoster/UploadedTo.py
+++ b/module/plugins/hoster/UploadedTo.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 import re
-from time import time
 from module.plugins.Hoster import Hoster
 from module.network.Request import getURL
 from module.plugins.Plugin import chunks