merged

7 files changed, 1 insertions, 59 deletions

diff --git a/Plugins/RSDF.py b/Plugins/RSDF.py
index bbbf3d960..74c07a007 100644
--- a/Plugins/RSDF.py
+++ b/Plugins/RSDF.py
@@ -27,9 +27,6 @@ class RSDF(Plugin):
         """ returns True or False 
         """
         return True
-    
-    def __call__(self):
-        return self.props['name']
 
     def proceed(self, url, location):
         try:
diff --git a/Plugins/UploadedTo.py b/Plugins/UploadedTo.py
index aeda42f1c..67c8685fa 100644
--- a/Plugins/UploadedTo.py
+++ b/Plugins/UploadedTo.py
@@ -22,17 +22,8 @@ class UploadedTo(Plugin):
         self.html_old = None         #time() where loaded the HTML
         self.time_plus_wait = None   #time() + wait in seconds
         self.want_reconnect = None
-	self.multi_dl = False
+        self.multi_dl = False
     
-    def set_parent_status(self):
-        """ sets all available Statusinfos about a File in self.parent.status
-        """
-        if self.html == None:
-            self.download_html()
-        self.parent.status.filename = self.get_file_name()
-        self.parent.status.url = self.get_file_url()
-        self.parent.status.wait = self.wait_until()
-        
     def download_html(self):
         url = self.parent.url
         self.html = self.req.load(url)
diff --git a/Plugins/XupIn.py b/Plugins/XupIn.py
index 534be2e94..21bcd3434 100644
--- a/Plugins/XupIn.py
+++ b/Plugins/XupIn.py
@@ -23,15 +23,6 @@ class XupIn(Plugin):
         self.posts = {}
         self.want_reconnect = None
         self.multi_dl = False
-    
-    def set_parent_status(self):
-        """ sets all available Statusinfos about a File in self.parent.status
-        """
-        if self.html == None:
-            self.download_html()
-        self.parent.status.filename = self.get_file_name()
-        self.parent.status.url = self.get_file_url()
-        self.parent.status.wait = self.wait_until()
         
     def download_html(self):
         url = self.parent.url
diff --git a/Plugins/YoupornCom.py b/Plugins/YoupornCom.py
index ff5ef67e3..f26d237f1 100644
--- a/Plugins/YoupornCom.py
+++ b/Plugins/YoupornCom.py
@@ -20,15 +20,6 @@ class YoupornCom(Plugin):
         self.html = None
         self.html_old = None         #time() where loaded the HTML
         self.time_plus_wait = None   #time() + wait in seconds
-    
-    def set_parent_status(self):
-        """ sets all available Statusinfos about a File in self.parent.status
-        """
-        if self.html == None:
-            self.download_html()
-        self.parent.status.filename = self.get_file_name()
-        self.parent.status.url = self.get_file_url()
-        self.parent.status.wait = self.wait_until()
         
     def download_html(self):
         url = self.parent.url
@@ -45,7 +36,6 @@ class YoupornCom(Plugin):
     def get_file_name(self):
         if self.html == None:
             self.download_html()
-        print "so far (name)"
         file_name_pattern = r"<title>(.*) - Free Porn Videos - YouPorn.com Lite.*"
         return re.search(file_name_pattern, self.html).group(1) + '.flv'
         
diff --git a/Plugins/YoutubeCom.py b/Plugins/YoutubeCom.py
index 0d5a2bf6d..0d738d52d 100644
--- a/Plugins/YoutubeCom.py
+++ b/Plugins/YoutubeCom.py
@@ -18,15 +18,6 @@ class YoutubeCom(Plugin):
         self.props = props
         self.parent = parent
         self.html = None
-    
-    def set_parent_status(self):
-        """ sets all available Statusinfos about a File in self.parent.status
-        """
-        if self.html == None:
-            self.download_html()
-        self.parent.status.filename = self.get_file_name()
-        self.parent.status.url = self.get_file_url()
-        self.parent.status.wait = self.wait_until()
         
     def download_html(self):
         url = self.parent.url
diff --git a/Plugins/ZippyshareCom.py b/Plugins/ZippyshareCom.py
index 17e7288f9..59bce0623 100644
--- a/Plugins/ZippyshareCom.py
+++ b/Plugins/ZippyshareCom.py
@@ -22,15 +22,6 @@ class ZippyshareCom(Plugin):
         self.html = None
         self.want_reconnect = False
         self.multi_dl = False
-    
-    def set_parent_status(self):
-        """ sets all available Statusinfos about a File in self.parent.status
-        """
-        if self.html == None:
-            self.download_html()
-        self.parent.status.filename = self.get_file_name()
-        self.parent.status.url = self.get_file_url()
-        self.parent.status.wait = self.wait_until()
         
     def download_html(self):
         url = self.parent.url
diff --git a/Plugins/ZshareNet.py b/Plugins/ZshareNet.py
index 58c32e0ed..0979e88c7 100644
--- a/Plugins/ZshareNet.py
+++ b/Plugins/ZshareNet.py
@@ -23,15 +23,6 @@ class ZshareNet(Plugin):
         self.posts = {}
         self.want_reconnect = False
         self.multi_dl = False
-    
-    def set_parent_status(self):
-        """ sets all available Statusinfos about a File in self.parent.status
-        """
-        if self.html[0] == None:
-            self.download_html()
-        self.parent.status.filename = self.get_file_name()
-        self.parent.status.url = self.get_file_url()
-        self.parent.status.wait = self.wait_until()
         
     def download_html(self):
         url = self.parent.url