diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-05-12 12:22:20 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-05-12 12:22:20 +0200 |
| commit | 906bb7c1ecc5c34aa93148894eef763f27eba98e (patch) | |
| tree | 2f09a639cdd9e414e8f165a667c71a837288d4de /pyload/plugin/addon | |
| parent | Revert damaged logo.png (diff) | |
| download | pyload-906bb7c1ecc5c34aa93148894eef763f27eba98e.tar.xz | |
Other import fixes
Diffstat (limited to 'pyload/plugin/addon')
| -rw-r--r-- | pyload/plugin/addon/ExtractArchive.py | 3 | ||||
| -rw-r--r-- | pyload/plugin/addon/IRCInterface.py | 5 | ||||
| -rw-r--r-- | pyload/plugin/addon/UpdateManager.py | 5 |
3 files changed, 5 insertions, 8 deletions
diff --git a/pyload/plugin/addon/ExtractArchive.py b/pyload/plugin/addon/ExtractArchive.py index a2b22e90c..53bf5559d 100644 --- a/pyload/plugin/addon/ExtractArchive.py +++ b/pyload/plugin/addon/ExtractArchive.py @@ -51,7 +51,6 @@ try: except ImportError: pass -from copy import copy if os.name != "nt": from grp import getgrnam from pwd import getpwnam @@ -145,7 +144,7 @@ class ExtractArchive(Addon): def setup(self): - self.queue = ArchiveQueue(self, "Queue") + self.queue = ArchiveQueue(self, "Queue.Queue") self.failed = ArchiveQueue(self, "Failed") self.interval = 60 diff --git a/pyload/plugin/addon/IRCInterface.py b/pyload/plugin/addon/IRCInterface.py index eb015c362..0c8f2ce8b 100644 --- a/pyload/plugin/addon/IRCInterface.py +++ b/pyload/plugin/addon/IRCInterface.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import re +import select import socket import ssl import time @@ -9,8 +10,6 @@ import traceback import pycurl -from select import select - from pyload.Api import PackageDoesNotExists, FileDoesNotExists from pyload.network.RequestFactory import getURL from pyload.plugin.Addon import Addon @@ -112,7 +111,7 @@ class IRCInterface(Thread, Addon): readbuffer = "" while True: time.sleep(1) - fdset = select([self.sock], [], [], 0) + fdset = select.select([self.sock], [], [], 0) if self.sock not in fdset[0]: continue diff --git a/pyload/plugin/addon/UpdateManager.py b/pyload/plugin/addon/UpdateManager.py index 84d282bde..ec147a29a 100644 --- a/pyload/plugin/addon/UpdateManager.py +++ b/pyload/plugin/addon/UpdateManager.py @@ -2,13 +2,12 @@ from __future__ import with_statement +import operator import os import re import sys import time -from operator import itemgetter - from pyload.network.RequestFactory import getURL from pyload.plugin.Addon import Expose, Addon, threaded from pyload.utils import fs_join @@ -220,7 +219,7 @@ class UpdateManager(Addon): 'name': n, }) - for plugin in sorted(updatelist, key=itemgetter("type", "name")): + for plugin in sorted(updatelist, key=operator.itemgetter("type", "name")): filename = plugin['name'] type = plugin['type'] version = plugin['version'] |