3 files changed, 6 insertions, 8 deletions
diff --git a/pyload/plugin/addon/ClickNLoad.py b/pyload/plugin/addon/ClickNLoad.py
index 4e1be807d..9e62072ba 100644
--- a/pyload/plugin/addon/ClickNLoad.py
+++ b/pyload/plugin/addon/ClickNLoad.py
@@ -1,10 +1,9 @@
 # -*- coding: utf-8 -*-
 
 import socket
+import threading
 import time
 
-from threading import Lock
-
 from pyload.plugin.Addon import Addon, threaded
 
 
@@ -55,7 +54,7 @@ class ClickNLoad(Addon):
 
         self._server(ip, webport, cnlport)
 
-        lock = Lock()
+        lock = threading.Lock()
         lock.acquire()
         lock.acquire()
 
diff --git a/pyload/plugin/addon/HotFolder.py b/pyload/plugin/addon/HotFolder.py
index 14d0a7ce3..f7f543c3a 100644
--- a/pyload/plugin/addon/HotFolder.py
+++ b/pyload/plugin/addon/HotFolder.py
@@ -3,10 +3,9 @@
 from __future__ import with_statement
 
 import os
+import shutil
 import time
 
-from shutil import move
-
 from pyload.plugin.Addon import Addon
 from pyload.utils import fs_encode, fs_join
 
@@ -65,7 +64,7 @@ class HotFolder(Addon):
                     continue
 
                 newpath = os.path.join(folder, "finished", f if self.getConfig('keep') else "tmp_" + f)
-                move(path, newpath)
+                shutil.move(path, newpath)
 
                 self.logInfo(_("Added %s from HotFolder") % f)
                 self.core.api.addPackage(f, [newpath], 1)
diff --git a/pyload/plugin/addon/IRCInterface.py b/pyload/plugin/addon/IRCInterface.py
index 051d30aa9..3cf21b409 100644
--- a/pyload/plugin/addon/IRCInterface.py
+++ b/pyload/plugin/addon/IRCInterface.py
@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
 
-import pycurl
 import re
 import socket
 import ssl
 import time
 import traceback
 
+import pycurl
+
 from select import select
-from threading import Thread
 
 from pyload.api import PackageDoesNotExists, FileDoesNotExists
 from pyload.network.RequestFactory import getURL