Code cleanup

lib/core/common.py

@@ -736,7 +736,7 @@ def getDelayQuery(andCond=False):
 
         else:
             query = queries[kb.dbms].timedelay2 % conf.timeSec
-    elif kb.dbms is "Firebird":
+    elif kb.dbms == "Firebird":
         query = queries[kb.dbms].timedelay
     else:
         query = queries[kb.dbms].timedelay % conf.timeSec
@@ -744,7 +744,7 @@ def getDelayQuery(andCond=False):
     if andCond:
         if kb.dbms in ( "MySQL", "SQLite" ):
             query = query.replace("SELECT ", "")
-        elif kb.dbms is "Firebird":
+        elif kb.dbms == "Firebird":
             query = "(%s)>0" % query
 
     return query
@@ -914,6 +914,7 @@ def sanitizeAsciiString(string):
 
 def decloakToNamedTemporaryFile(filepath, name=None):
     retVal = NamedTemporaryFile()
+
     def __del__():
         try:
             if hasattr(retVal, 'old_name'):
@@ -921,12 +922,15 @@ def decloakToNamedTemporaryFile(filepath, name=None):
             retVal.close()
         except OSError:
             pass
+
     retVal.__del__ = __del__
     retVal.write(decloak(filepath))
     retVal.seek(0)
+
     if name:
         retVal.old_name = retVal.name
         retVal.name = name
+
     return retVal
 
 def decloakToMkstemp(filepath, **kwargs):

lib/core/dump.py

@@ -125,7 +125,7 @@ class Dump:
         print
 
     def dbColumns(self, dbColumns, colConsider, dbs):
-        for column, dbTables in dbColumns.items():
+        for column in dbColumns.keys():
             if colConsider == "1":
                 colConsiderStr = "s like '" + column + "' were"
             else:

lib/core/option.py

@@ -632,9 +632,9 @@ def __setHTTPAuthentication():
         key_file = os.path.expanduser(aCertRegExp.group(1))
         cert_file = os.path.expanduser(aCertRegExp.group(2))
         
-        for file in (key_file, cert_file):
-            if not os.path.exists(file):
-                errMsg  = "File '%s' doesn't exist" % file
+        for ifile in (key_file, cert_file):
+            if not os.path.exists(ifile):
+                errMsg  = "File '%s' does not exist" % ifile
                 raise sqlmapSyntaxException, errMsg
         
         authHandler = HTTPSCertAuthHandler(key_file, cert_file)

lib/core/update.py

@@ -47,7 +47,6 @@ from lib.core.data import paths
 from lib.core.exception import sqlmapConnectionException
 from lib.core.exception import sqlmapFilePathException
 from lib.core.settings import MSSQL_VERSIONS_URL
-from lib.core.settings import VERSION
 from lib.request.connect import Connect as Request
 
 def __updateMSSQLXML():