diff options
Diffstat (limited to 'pyload/threads')
| -rw-r--r-- | pyload/threads/DownloadThread.py | 4 | ||||
| -rw-r--r-- | pyload/threads/InfoThread.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pyload/threads/DownloadThread.py b/pyload/threads/DownloadThread.py index b5a45185f..4c4ee597c 100644 --- a/pyload/threads/DownloadThread.py +++ b/pyload/threads/DownloadThread.py @@ -26,7 +26,7 @@ from pycurl import error from pyload.plugins.Base import Fail, Retry, Abort from pyload.plugins.Hoster import Reconnect, SkipDownload -from pyload.network.HTTPRequest import BadHeader +from pyload.plugins.Request import ResponseException from BaseThread import BaseThread @@ -182,7 +182,7 @@ class DownloadThread(BaseThread): except Exception, e: - if isinstance(e, BadHeader) and e.code == 500: + if isinstance(e, ResponseException) and e.code == 500: pyfile.setStatus("temp. offline") self.log.warning(_("Download is temporary offline: %s") % pyfile.name) pyfile.error = _("Internal Server Error") diff --git a/pyload/threads/InfoThread.py b/pyload/threads/InfoThread.py index f516d2cca..62e309020 100644 --- a/pyload/threads/InfoThread.py +++ b/pyload/threads/InfoThread.py @@ -56,8 +56,8 @@ class InfoThread(DecrypterThread): cb = self.updateDB if self.pid > 1 else self.updateResult for pluginname, urls in plugins.iteritems(): - plugin = self.m.core.pluginManager.getPluginModule(pluginname) - klass = self.m.core.pluginManager.getPluginClass(pluginname) + plugin = self.m.core.pluginManager.loadModule("hoster", pluginname) + klass = self.m.core.pluginManager.getPluginClass("hoster", pluginname, overwrite=False) if has_method(klass, "getInfo"): self.fetchForPlugin(klass, urls, cb) # TODO: this branch can be removed in the future |