few minor fixes

stamparm · stamparm · commit 08bf8c201f7d · 2012-02-20T10:24:55.000Z
diff --git a/doc/THANKS b/doc/THANKS
@@ -633,7 +633,7 @@ fufuh <fufuh@users.sourceforge.net>
     for reporting a bug when running on Windows
 
 Hans Wurst <wurstwass0r@googlemail.com>
-    for reporting a bug
+    for reporting a couple of bugs
 
 james <james@ev6.net>
     for reporting a bug
diff --git a/plugins/generic/enumeration.py b/plugins/generic/enumeration.py
@@ -572,7 +572,7 @@ def getPrivileges(self, query2=False):
                 count = inject.getValue(query, inband=False, error=False, expected=EXPECTED.INT, charsetType=2)
 
                 if not isNumPosStrValue(count):
-                    if not (isinstance(count, basestring) and count.isdigit()) and Backend.isDbms(DBMS.ORACLE) and not query2:
+                    if Backend.isDbms(DBMS.ORACLE) and not query2:
                         infoMsg = "trying with table USER_SYS_PRIVS"
                         logger.info(infoMsg)
 
@@ -1320,7 +1320,7 @@ def __tableGetCount(self, db, table):
 
         count = inject.getValue(query, expected=EXPECTED.INT, charsetType=2)
 
-        if count is not None and isinstance(count, basestring) and count.isdigit():
+        if isNumPosStrValue(count):
             if safeSQLIdentificatorNaming(db) not in kb.data.cachedCounts:
                 kb.data.cachedCounts[safeSQLIdentificatorNaming(db)] = {}
 
@@ -1672,7 +1672,7 @@ def dumpTable(self, foundData=None):
                     lengths = {}
                     entries = {}
 
-                    if count == "0":
+                    if count == 0:
                         warnMsg  = "table '%s' " % unsafeSQLIdentificatorNaming(tbl)
                         warnMsg += "on database '%s' " % unsafeSQLIdentificatorNaming(conf.db)
                         warnMsg += "appears to be empty"
