fix regarding proper string isinstance checking (including unicode)

lib/core/common.py

@@ -149,7 +149,7 @@ def formatDBMSfp(versions=None):
     if ( not versions or versions == [None] ) and kb.dbmsVersion and kb.dbmsVersion[0] != "Unknown":
         versions = kb.dbmsVersion
 
-    if isinstance(versions, str):
+    if isinstance(versions, basestring):
         return "%s %s" % (kb.dbms, versions)
     elif isinstance(versions, (list, set, tuple)):
         return "%s %s" % (kb.dbms, " and ".join([version for version in versions]))
@@ -848,7 +848,7 @@ def parseUnionPage(output, expression, partial=False, condition=None, sort=True)
     else:
         data = output
 
-    if len(data) == 1 and isinstance(data[0], str):
+    if len(data) == 1 and isinstance(data[0], basestring):
         data = data[0]
 
     return data
@@ -1019,7 +1019,7 @@ def normalizePath(path):
 def safeStringFormat(formatStr, params):
     retVal = formatStr.replace("%d", "%s")
 
-    if isinstance(params, str):
+    if isinstance(params, basestring):
         retVal = retVal.replace("%s", params)
     else:
         count = 0

lib/core/dump.py

@@ -90,7 +90,7 @@ class Dump:
                 pass
 
         for element in elements:
-            if isinstance(element, str):
+            if isinstance(element, basestring):
                 self.__write("[*] %s" % element)
             elif isinstance(element, (list, tuple, set)):
                 self.__write("[*] " + ", ".join(str(e) for e in element))

lib/core/option.py

@@ -1011,7 +1011,7 @@ def __saveCmdline():
                 elif datatype == "string":
                     value = ""
 
-            if isinstance(value, str):
+            if isinstance(value, basestring):
                 value = value.replace("\n", "\n ")
 
             config.set(family, option, value)

lib/core/session.py

@@ -193,7 +193,7 @@ def setStacked():
                   not kb.resumedQueries[conf.url].has_key("Stacked queries") )
                 )
 
-    if not isinstance(kb.stackedTest, str):
+    if not isinstance(kb.stackedTest, basestring):
         return
 
     if condition:

lib/core/shell.py

@@ -45,7 +45,7 @@ def queriesForAutoCompletion():
     autoComplQueries = {}
 
     for _, query in queries[kb.dbms].items():
-        if isinstance(query, str) and len(query) > 1:
+        if isinstance(query, basestring) and len(query) > 1:
             autoComplQuery = query
         elif isinstance(query, dict) and "inband" in query:
             autoComplQuery = query["inband"]["query"]