Minor refactoring

stamparm · stamparm · commit 14b7e655a9f4 · 2013-01-16T16:33:04.000+01:00
diff --git a/lib/core/log.py b/lib/core/log.py
@@ -6,11 +6,9 @@
 """
 
 import logging
-import StringIO
 import sys
 
 from lib.core.enums import CUSTOM_LOGGING
-from thirdparty.ansistrm.ansistrm import ColorizingStreamHandler
 
 logging.addLevelName(CUSTOM_LOGGING.PAYLOAD, "PAYLOAD")
 logging.addLevelName(CUSTOM_LOGGING.TRAFFIC_OUT, "TRAFFIC OUT")
@@ -20,7 +18,8 @@
 
 LOGGER_HANDLER = None
 try:
-    import ctypes
+    from thirdparty.ansistrm.ansistrm import ColorizingStreamHandler
+
     LOGGER_HANDLER = ColorizingStreamHandler(sys.stdout)
     LOGGER_HANDLER.level_map[logging.getLevelName("PAYLOAD")] = (None, "cyan", False)
     LOGGER_HANDLER.level_map[logging.getLevelName("TRAFFIC OUT")] = (None, "magenta", False)
diff --git a/lib/core/option.py b/lib/core/option.py
@@ -54,7 +54,6 @@
 from lib.core.common import urlencode
 from lib.core.convert import base64pickle
 from lib.core.convert import base64unpickle
-from lib.core.convert import jsonize
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
diff --git a/lib/request/proxy.py b/lib/request/proxy.py
@@ -11,8 +11,6 @@
 import urllib
 import urllib2
 
-from lib.core.exception import SqlmapUnsupportedFeatureException
-
 
 class ProxyHTTPConnection(httplib.HTTPConnection):
     _ports = {"http": 80, "https": 443}
diff --git a/plugins/generic/databases.py b/plugins/generic/databases.py
@@ -13,7 +13,6 @@
 from lib.core.common import isInferenceAvailable
 from lib.core.common import isListLike
 from lib.core.common import isNoneValue
-from lib.core.common import isNullValue
 from lib.core.common import isNumPosStrValue
 from lib.core.common import isTechniqueAvailable
 from lib.core.common import parseSqliteTableSchema
diff --git a/thirdparty/ansistrm/ansistrm.py b/thirdparty/ansistrm/ansistrm.py
@@ -1,6 +1,7 @@
 #
 # Copyright (C) 2010-2012 Vinay Sajip. All rights reserved. Licensed under the new BSD license.
 #
+import ctypes
 import logging
 import os
 import re
@@ -69,7 +70,6 @@ def emit(self, record):
         def output_colorized(self, message):
             self.stream.write(message)
     else:
-        import re
         ansi_esc = re.compile(r'\x1b\[((?:\d+)(?:;(?:\d+))*)m')
 
         nt_color_map = {
@@ -84,8 +84,6 @@ def output_colorized(self, message):
         }
 
         def output_colorized(self, message):
-            import ctypes
-
             parts = self.ansi_esc.split(message)
             write = self.stream.write
             h = None
