More work for Issue #66

lib/request/basic.py

@@ -12,7 +12,6 @@ import re
 import StringIO
 import zlib
 
-from extra.chardet import detect
 from lib.core.common import extractErrorMessage
 from lib.core.common import extractRegexResult
 from lib.core.common import getUnicode
@@ -30,6 +29,7 @@ from lib.core.settings import META_CHARSET_REGEX
 from lib.core.settings import PARSE_HEADERS_LIMIT
 from lib.parse.headers import headersParser
 from lib.parse.html import htmlParser
+from thirdparty.chardet import detect
 
 def forgeHeaders(items=None):
     """

lib/request/connect.py

@@ -14,9 +14,6 @@ import urlparse
 import traceback
 
 from extra.safe2bin.safe2bin import safecharencode
-from extra.socks.socks import ProxyError
-from extra.multipart import multipartpost
-
 from lib.core.agent import agent
 from lib.core.common import asciifyUrl
 from lib.core.common import calculateDeltaSeconds
@@ -67,6 +64,8 @@ from lib.request.direct import direct
 from lib.request.comparison import comparison
 from lib.request.methodrequest import MethodRequest
 from lib.utils.checkpayload import checkPayload
+from thirdparty.socks.socks import ProxyError
+from thirdparty.multipart import multipartpost
 
 
 class Connect: