diff options
| author |  Armin <Armin@Armin-PC.diedering.lan>
| 2015-04-12 18:34:55 +0200 |
|---|---|---|
| committer | Armin <Armin@Armin-PC.diedering.lan>
| 2015-04-12 18:34:55 +0200 |
| commit | 3a82d5f45ffed16d654220efa92ef6b75ea3163b (patch) | |
| tree | 8ab6550e7afa428240b105e77d2e204713eb257c /pyload/manager | |
| parent | fix, fix and more fixes (diff) | |
| download | pyload-3a82d5f45ffed16d654220efa92ef6b75ea3163b.tar.xz | |
import fixes + code-cleanup
Diffstat (limited to 'pyload/manager')
| -rw-r--r-- | pyload/manager/thread/Decrypter.py | 3 | ||||
| -rw-r--r-- | pyload/manager/thread/Download.py | 3 | ||||
| -rw-r--r-- | pyload/manager/thread/Info.py | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/pyload/manager/thread/Decrypter.py b/pyload/manager/thread/Decrypter.py index 7fcf93e4c..12806163c 100644 --- a/pyload/manager/thread/Decrypter.py +++ b/pyload/manager/thread/Decrypter.py @@ -48,8 +48,7 @@ class DecrypterThread(PluginThread): pyfile.plugin.preprocessing(self) except NotImplementedError: - self.m.core.log.error( - _("Plugin %s is missing a function.") % pyfile.pluginname) + self.m.core.log.error(_("Plugin %s is missing a function.") % pyfile.pluginname) return except Fail, e: diff --git a/pyload/manager/thread/Download.py b/pyload/manager/thread/Download.py index d4006d307..37fe844ec 100644 --- a/pyload/manager/thread/Download.py +++ b/pyload/manager/thread/Download.py @@ -166,8 +166,7 @@ class DownloadThread(PluginThread): except SkipDownload, e: pyfile.setStatus("skipped") - self.m.core.log.info( - _("Download skipped: %(name)s due to %(plugin)s") % {"name": pyfile.name, "plugin": e.message}) + self.m.core.log.info(_("Download skipped: %(name)s due to %(plugin)s") % {"name": pyfile.name, "plugin": e.message}) self.clean(pyfile) diff --git a/pyload/manager/thread/Info.py b/pyload/manager/thread/Info.py index af958fa74..edc9489e9 100644 --- a/pyload/manager/thread/Info.py +++ b/pyload/manager/thread/Info.py @@ -45,7 +45,7 @@ class InfoThread(PluginThread): for url, plugintype, pluginname in self.data: # filter out container plugins if plugintype == 'container': - container.extend([(name, url) for url in plugins[name]]) + container.appen((pluginname, url)) else: if (plugintype, pluginname) in plugins: plugins[(plugintype, pluginname)].append(url) |