Plugins cleanup

3 files changed, 4 insertions, 9 deletions

diff --git a/pyload/plugin/internal/SimpleDereferer.py b/pyload/plugin/internal/SimpleDereferer.py
index f3596b32c..c82afe0b4 100644
--- a/pyload/plugin/internal/SimpleDereferer.py
+++ b/pyload/plugin/internal/SimpleDereferer.py
@@ -59,10 +59,7 @@ class SimpleDereferer(Crypter):
                 link = self.getLink()
 
         if link.strip():
-            self.urls = [link.strip()]  #@TODO: Remove `.strip()` in 0.4.10
-
-        elif not self.urls and not self.packages:  #@TODO: Remove in 0.4.10
-            self.fail(_("No link grabbed"))
+            self.urls = [link]
 
 
     def prepare(self):
diff --git a/pyload/plugin/internal/SimpleHoster.py b/pyload/plugin/internal/SimpleHoster.py
index a215e6886..add54786f 100644
--- a/pyload/plugin/internal/SimpleHoster.py
+++ b/pyload/plugin/internal/SimpleHoster.py
@@ -728,8 +728,8 @@ class SimpleHoster(Hoster):
         elif traffic == -1:
             return True
         else:
-            size = self.pyfile.size / 1024
-            self.logInfo(_("Filesize: %i KiB, Traffic left for user %s: %i KiB") % (size, self.user, traffic))
+            size = self.pyfile.size
+            self.logInfo(_("Filesize: %i KiB, Traffic left for user %s: %i KiB") % (size / 1024, self.user, traffic / 1024))
             return size <= traffic
 
 
@@ -751,8 +751,6 @@ class SimpleHoster(Hoster):
         self.retries = 0
         raise Retry(_("Fallback to free download"))
 
-    #@TODO: Remove in 0.4.10
-
 
     def wait(self, seconds=0, reconnect=None):
         return _wait(self, seconds, reconnect)
diff --git a/pyload/plugin/internal/XFSHoster.py b/pyload/plugin/internal/XFSHoster.py
index 92ec020a6..7b8149bc3 100644
--- a/pyload/plugin/internal/XFSHoster.py
+++ b/pyload/plugin/internal/XFSHoster.py
@@ -113,7 +113,7 @@ class XFSHoster(SimpleHoster):
             self.logError(data['op'] if 'op' in data else _("UNKNOWN"))
             return ""
 
-        self.link = m.group(1).strip()  #@TODO: Remove .strip() in 0.4.10
+        self.link = m.group(1)
 
 
     def handlePremium(self, pyfile):