Merge pull request #1 from vuolter/0.4.10

merge from vuolter/pyload

3 files changed, 11 insertions, 11 deletions

diff --git a/pyload/plugin/Plugin.py b/pyload/plugin/Plugin.py
index 9e5f1e55b..3ccf94f34 100644
--- a/pyload/plugin/Plugin.py
+++ b/pyload/plugin/Plugin.py
@@ -244,7 +244,7 @@ class Plugin(Base):
         #: captcha task
         self.cTask = None
 
-        self.html = None  # @TODO: Move to hoster class in 0.4.10
+        self.html = None  #@TODO: Move to hoster class in 0.4.10
         self.retries = 0
 
         self.init()
@@ -538,7 +538,7 @@ class Plugin(Base):
         if not url:
             self.fail(_("No url given"))
 
-        url = urllib.unquote(encode(url).strip())  # @NOTE: utf8 vs decode -> please use decode attribute in all future plugins
+        url = urllib.unquote(encode(url).strip())  #@NOTE: utf8 vs decode -> please use decode attribute in all future plugins
 
         if self.core.debug:
             self.logDebug("Load url: " + url, *["%s=%s" % (key, val) for key, val in locals().iteritems() if key not in ("self", "url")])
diff --git a/pyload/plugin/internal/MultiHook.py b/pyload/plugin/internal/MultiHook.py
index 2b125d4a1..87b01c13a 100644
--- a/pyload/plugin/internal/MultiHook.py
+++ b/pyload/plugin/internal/MultiHook.py
@@ -69,7 +69,7 @@ class MultiHook(Hook):
 
 
     def initPlugin(self):
-        self.pluginname         = self.__class__.__name__.rsplit("Hook", 1)[0]
+        self.pluginname         = self.__class__.__name__
         plugin, self.plugintype = self.core.pluginManager.findPlugin(self.pluginname)
 
         if plugin:
diff --git a/pyload/plugin/internal/SimpleHoster.py b/pyload/plugin/internal/SimpleHoster.py
index 09f49af18..c0cdc05a8 100644
--- a/pyload/plugin/internal/SimpleHoster.py
+++ b/pyload/plugin/internal/SimpleHoster.py
@@ -307,11 +307,11 @@ class SimpleHoster(Hoster):
     LOGIN_ACCOUNT = False  #: Set to True to require account login
     DISPOSITION   = True   #: Set to True to use any content-disposition value in http header as file name
 
-    directLink = getFileURL  # @TODO: Remove in 0.4.10
+    directLink = getFileURL  #@TODO: Remove in 0.4.10
 
 
     @classmethod
-    def parseInfos(cls, urls):  # @TODO: Built-in in 0.4.10 core (remove from plugins)
+    def parseInfos(cls, urls):  #@TODO: Built-in in 0.4.10 core (remove from plugins)
         for url in urls:
             url = replace_patterns(url, cls.URL_REPLACEMENTS)
             yield cls.getInfo(url)
@@ -414,13 +414,13 @@ class SimpleHoster(Hoster):
 
 
     def prepare(self):
-        self.pyfile.error = ""  # @TODO: Remove in 0.4.10
+        self.pyfile.error = ""  #@TODO: Remove in 0.4.10
 
         self.info      = {}
         self.html      = ""
-        self.link      = ""  # @TODO: Move to hoster class in 0.4.10
-        self.directDL  = False  # @TODO: Move to hoster class in 0.4.10
-        self.multihost = False  # @TODO: Move to hoster class in 0.4.10
+        self.link      = ""  #@TODO: Move to hoster class in 0.4.10
+        self.directDL  = False  #@TODO: Move to hoster class in 0.4.10
+        self.multihost = False  #@TODO: Move to hoster class in 0.4.10
 
         if not self.getConfig('use_premium', True):
             self.retryFree()
@@ -486,7 +486,7 @@ class SimpleHoster(Hoster):
             self.downloadLink(self.link, self.DISPOSITION)
             self.checkFile()
 
-        except Fail, e:  # @TODO: Move to PluginThread in 0.4.10
+        except Fail, e:  #@TODO: Move to PluginThread in 0.4.10
             if self.premium:
                 self.logWarning(_("Premium download failed"))
                 self.retryFree()
@@ -733,7 +733,7 @@ class SimpleHoster(Hoster):
             return size <= traffic
 
 
-    def getConfig(self, option, default=''):  # @TODO: Remove in 0.4.10
+    def getConfig(self, option, default=''):  #@TODO: Remove in 0.4.10
         """getConfig with default value - sublass may not implements all config options"""
         try:
             return self.getConf(option)