Version bump v2.0.0-beta.14

+ Fix oop logger

Author: Kronuz

codeintel/__init__.py

@@ -1 +1 @@
-__version__ = '2.0.0-beta.13'
+__version__ = '2.0.0-beta.14'

codeintel/__main__.py

@@ -96,7 +96,6 @@ def __init__(self, *args, **kwargs):
 
         # Don't redirect output
         os.environ["KOMODO_VERBOSE"] = "1"
-        logging.basicConfig(stream=TextStream(sys.stderr))
 
         self.verbosity = 0
         self.traceback = False
@@ -205,7 +204,7 @@ def set_log_file(self, option, opt_str, value, parser):
             if not os.path.exists(log_dir):
                 os.makedirs(log_dir)
             stream = open(value, 'wt')
-        logging.basicConfig(stream=TextStream(stream))
+        logging.getLogger().addHandler(logging.StreamHandler(stream=TextStream(stream)))
         # XXX marky horrible ugly hack
         sys.stderr = stream
         sys.stdout = stream

codeintel/client.py

@@ -52,7 +52,7 @@
 
 logger_name = 'CodeIntel.codeintel'
 
-logging.getLogger(logger_name).setLevel(logging.INFO)
+logging.getLogger(logger_name).setLevel(logging.INFO)  # INFO
 
 
 class CodeIntel(object):

codeintel/codeintel2/citadel.py

@@ -547,7 +547,7 @@ def import_blob_name(self, import_name, libs, ctlr):
         for lib in libs:
             blob = lib.get_blob(import_name)
             if blob is not None:
-                ctlr.info("is blob '%s' from %s? yes", import_name, lib)
+                ctlr.info("is blob '%s' from %s? yes (%s)", import_name, lib, blob.get("src"))
                 return blob
             else:
                 ctlr.info("is blob '%s' from %s? no", import_name, lib)

codeintel/process.py

@@ -39,7 +39,6 @@
 import sys
 import time
 import types
-import six
 if sys.platform != "win32":
     import signal  # used by kill() method on Linux/Mac
 import logging
@@ -49,7 +48,7 @@
 if sys.version_info[0] == 3:
     string_types = str
 else:
-    string_types = six.string_types
+    string_types = basestring
 
 #-------- Globals -----------#