2 files changed, 5 insertions, 6 deletions
diff --git a/pyload/network/HTTPRequest.py b/pyload/network/HTTPRequest.py
index a27c59ff2..22a4cc604 100644
--- a/pyload/network/HTTPRequest.py
+++ b/pyload/network/HTTPRequest.py
@@ -3,12 +3,12 @@
 
 from __future__ import with_statement
 
+import codecs
 import logging
 import urllib
 
 import pycurl
 
-from codecs import getincrementaldecoder, lookup, BOM_UTF8
 from httplib import responses
 from cStringIO import StringIO
 
@@ -267,10 +267,10 @@ class HTTPRequest(object):
 
         try:
             # self.log.debug("Decoded %s" % encoding )
-            if lookup(encoding).name == 'utf-8' and rep.startswith(BOM_UTF8):
+            if codecs.lookup(encoding).name == 'utf-8' and rep.startswith(codecs.BOM_UTF8):
                 encoding = 'utf-8-sig'
 
-            decoder = getincrementaldecoder(encoding)("replace")
+            decoder = codecs.getincrementaldecoder(encoding)("replace")
             rep = decoder.decode(rep, True)
 
             # TODO: html_unescape as default
diff --git a/pyload/network/XDCCRequest.py b/pyload/network/XDCCRequest.py
index 0d8e90db9..470ab96a7 100644
--- a/pyload/network/XDCCRequest.py
+++ b/pyload/network/XDCCRequest.py
@@ -2,12 +2,11 @@
 # @author: jeix
 
 import os
+import select
 import socket
 import struct
 import time
 
-from select import select
-
 from pyload.plugin.Plugin import Abort
 
 
@@ -110,7 +109,7 @@ class XDCCRequest(object):
 
 
     def _keepAlive(self, sock, *readbuffer):
-        fdset = select([sock], [], [], 0)
+        fdset = select.select([sock], [], [], 0)
         if sock not in fdset[0]:
             return