Other import fixes

5 files changed, 8 insertions, 12 deletions

diff --git a/pyload/Thread/Addon.py b/pyload/Thread/Addon.py
index 35168f615..e28fafd29 100644
--- a/pyload/Thread/Addon.py
+++ b/pyload/Thread/Addon.py
@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 # @author: RaNaN
 
+import Queue
+import copy
 import os
 import sys
 import time
 import traceback
 
-from Queue import Queue
-from copy import copy
 from pprint import pformat
 from types import MethodType
 
@@ -62,7 +62,7 @@ class AddonThread(PluginThread):
                 del self.kwargs['thread']
                 self.f(*self.args, **self.kwargs)
         finally:
-            local = copy(self.active)
+            local = copy.copy(self.active)
             for x in local:
                 self.finishFile(x)
 
diff --git a/pyload/Thread/Decrypter.py b/pyload/Thread/Decrypter.py
index b0c4d44e8..d4afac730 100644
--- a/pyload/Thread/Decrypter.py
+++ b/pyload/Thread/Decrypter.py
@@ -1,13 +1,12 @@
 # -*- coding: utf-8 -*-
 # @author: RaNaN
 
+import Queue
 import os
 import sys
 import time
 import traceback
 
-from Queue import Queue
-from copy import copy
 from pprint import pformat
 from types import MethodType
 
diff --git a/pyload/Thread/Download.py b/pyload/Thread/Download.py
index c7c2470dd..c20c7277e 100644
--- a/pyload/Thread/Download.py
+++ b/pyload/Thread/Download.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # @author: RaNaN
 
+import Queue
 import os
 import sys
 import time
@@ -8,8 +9,6 @@ import traceback
 
 import pycurl
 
-from Queue import Queue
-from copy import copy
 from pprint import pformat
 from types import MethodType
 
@@ -24,7 +23,7 @@ class DownloadThread(PluginThread):
         """Constructor"""
         PluginThread.__init__(self, manager)
 
-        self.queue = Queue()  #: job queue
+        self.queue = Queue.Queue()  #: job queue
         self.active = False
 
         self.start()
diff --git a/pyload/Thread/Info.py b/pyload/Thread/Info.py
index c1960fa9a..780a384bb 100644
--- a/pyload/Thread/Info.py
+++ b/pyload/Thread/Info.py
@@ -1,13 +1,12 @@
 # -*- coding: utf-8 -*-
 # @author: RaNaN
 
+import Queue
 import os
 import sys
 import time
 import traceback
 
-from Queue import Queue
-from copy import copy
 from pprint import pformat
 from types import MethodType
 
diff --git a/pyload/Thread/Plugin.py b/pyload/Thread/Plugin.py
index 0f1b14d26..ee1418a7d 100644
--- a/pyload/Thread/Plugin.py
+++ b/pyload/Thread/Plugin.py
@@ -3,14 +3,13 @@
 
 from __future__ import with_statement
 
+import Queue
 import os
 import sys
 import threading
 import time
 import traceback
 
-from Queue import Queue
-from copy import copy
 from pprint import pformat
 from types import MethodType