Minor refactoring

Author: stamparm

lib/core/dump.py

@@ -140,7 +140,7 @@ def lister(self, header, elements, content_type=None, sort=True):
             try:
                 elements = set(elements)
                 elements = list(elements)
-                elements.sort(key=lambda x: x.lower() if isinstance(x, basestring) else x)
+                elements.sort(key=lambda _: _.lower() if isinstance(_, basestring) else _)
             except:
                 pass
 
@@ -191,7 +191,7 @@ def userSettings(self, header, userSettings, subHeader, content_type=None):
             userSettings = userSettings[0]
 
         users = userSettings.keys()
-        users.sort(key=lambda x: x.lower() if isinstance(x, basestring) else x)
+        users.sort(key=lambda _: _.lower() if isinstance(_, basestring) else _)
 
         if conf.api:
             self._write(userSettings, content_type=content_type)
@@ -285,7 +285,7 @@ def dbTableColumns(self, tableColumns, content_type=None):
                     colType = None
 
                     colList = columns.keys()
-                    colList.sort(key=lambda x: x.lower() if isinstance(x, basestring) else x)
+                    colList.sort(key=lambda _: _.lower() if isinstance(_, basestring) else _)
 
                     for column in colList:
                         colType = columns[column]
@@ -377,7 +377,7 @@ def dbTablesCount(self, dbTables):
                     if count is None:
                         count = "Unknown"
 
-                    tables.sort(key=lambda x: x.lower() if isinstance(x, basestring) else x)
+                    tables.sort(key=lambda _: _.lower() if isinstance(_, basestring) else _)
 
                     for table in tables:
                         blank1 = " " * (maxlength1 - len(normalizeUnicode(table) or unicode(table)))

lib/core/settings.py

@@ -19,7 +19,7 @@
 from lib.core.enums import OS
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.1.12.29"
+VERSION = "1.1.12.30"
 TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
 TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
 VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)

txt/checksum.md5

@@ -34,7 +34,7 @@ d2cdb9e832e18a81e936ca3348144b16  lib/controller/handler.py
 a73da01cee9d00ba385b05adc4903037  lib/core/decorators.py
 d3ed5f9baa074df33390d33164d9d8b5  lib/core/defaults.py
 1c428d1b036ff81b459121a0e57925c9  lib/core/dicts.py
-956be8ca65c7f04f08c6f2dce710b3b2  lib/core/dump.py
+0ad5a563bb89f5961d3aa17e935fb49f  lib/core/dump.py
 8a29770c1d525edc27b6f82317183103  lib/core/enums.py
 9d2dede53d2f427f940c1b8f00b6e7a2  lib/core/exception.py
 5fb9aaf874daa47ea2b672a22740e56b  lib/core/__init__.py
@@ -46,7 +46,7 @@ f872699e948d0692ce11b54781da814c  lib/core/log.py
 760d9df2a27ded29109b390ab202e72d  lib/core/replication.py
 a2466b62e67f8b31736bac4dac590e51  lib/core/revision.py
 02d4762140a72fd44668d3dab5eabda9  lib/core/session.py
-686323f03ca4e5878cdb1ddfcad43f68  lib/core/settings.py
+5053df5f535a0cc8da2192a7b26887dd  lib/core/settings.py
 35bffbad762eb9e03db9e93b1c991103  lib/core/shell.py
 a59ec28371ae067a6fdd8f810edbee3d  lib/core/subprocessng.py
 d93501771b41315f9fb949305b6ed257  lib/core/target.py