Other import fixes

6 files changed, 11 insertions, 17 deletions

diff --git a/pyload/plugin/Plugin.py b/pyload/plugin/Plugin.py
index 7eeec996f..6648c574f 100644
--- a/pyload/plugin/Plugin.py
+++ b/pyload/plugin/Plugin.py
@@ -4,6 +4,7 @@ from __future__ import with_statement
 
 import traceback
 
+import itertools
 import os
 import random
 import re
@@ -11,8 +12,6 @@ import time
 import urllib
 import urlparse
 
-from itertools import islice
-
 if os.name != "nt":
     from pwd import getpwnam
     from grp import getgrnam
@@ -22,10 +21,10 @@ from pyload.utils import fs_decode, fs_encode, safe_filename, fs_join, encode
 
 def chunks(iterable, size):
     it = iter(iterable)
-    item = list(islice(it, size))
+    item = list(itertools.islice(it, size))
     while item:
         yield item
-        item = list(islice(it, size))
+        item = list(itertools.islice(it, size))
 
 
 class Abort(Exception):
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']
diff --git a/pyload/plugin/hoster/LuckyShareNet.py b/pyload/plugin/hoster/LuckyShareNet.py
index b199ab468..d07500d93 100644
--- a/pyload/plugin/hoster/LuckyShareNet.py
+++ b/pyload/plugin/hoster/LuckyShareNet.py
@@ -2,10 +2,9 @@
 
 import re
 
-from bottle import json_loads
-
 from pyload.plugin.captcha.ReCaptcha import ReCaptcha
 from pyload.plugin.internal.SimpleHoster import SimpleHoster
+from pyload.utils import json_loads
 
 
 class LuckyShareNet(SimpleHoster):
diff --git a/pyload/plugin/hoster/Xdcc.py b/pyload/plugin/hoster/Xdcc.py
index d7593a936..85f416aba 100644
--- a/pyload/plugin/hoster/Xdcc.py
+++ b/pyload/plugin/hoster/Xdcc.py
@@ -1,13 +1,12 @@
 # -*- coding: utf-8 -*-
 
 import re
+import select
 import socket
 import struct
 import sys
 import time
 
-from select import select
-
 from pyload.plugin.Hoster import Hoster
 from pyload.utils import fs_join
 
@@ -120,7 +119,7 @@ class Xdcc(Hoster):
                     sock.close()
                     self.fail(_("XDCC Bot did not answer"))
 
-            fdset = select([sock], [], [], 0)
+            fdset = select.select([sock], [], [], 0)
             if sock not in fdset[0]:
                 continue