Minor refactoring

stamparm · stamparm · commit f38a2c2028a4 · 2020-01-28T09:42:00.000+01:00
diff --git a/lib/core/decorators.py b/lib/core/decorators.py
@@ -28,7 +28,7 @@ def cachedmethod(f):
     >>> __ = cachedmethod(lambda *args, **kwargs: args[0])
     >>> __(2)
     2
-    >>> __ = cachedmethod(lambda *args, **kwargs: list(kwargs.values())[0])
+    >>> __ = cachedmethod(lambda *args, **kwargs: next(iter(kwargs.values())))
     >>> __(foobar=3)
     3
 
diff --git a/lib/core/option.py b/lib/core/option.py
@@ -347,7 +347,7 @@ def _setCrawler():
         if conf.url:
             crawl(conf.url)
         elif conf.requestFile and kb.targets:
-            target = list(kb.targets)[0]
+            target = next(iter(kb.targets))
             crawl(target[0], target[2], target[3])
 
 def _doSearch():
@@ -1735,8 +1735,7 @@ class _(six.text_type):
             conf.__setitem__(_, True)
 
     if conf.noCast:
-        for _ in list(DUMP_REPLACEMENTS.keys()):
-            del DUMP_REPLACEMENTS[_]
+        DUMP_REPLACEMENTS.clear()
 
     if conf.dumpFormat:
         conf.dumpFormat = conf.dumpFormat.upper()
diff --git a/lib/core/settings.py b/lib/core/settings.py
@@ -18,7 +18,7 @@
 from thirdparty.six import unichr as _unichr
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.4.1.59"
+VERSION = "1.4.1.60"
 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)

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ def cachedmethod(f):`
`28`	`28`	`>>> __ = cachedmethod(lambda args, *kwargs: args[0])`
`29`	`29`	`>>> __(2)`
`30`	`30`	`2`
`31`		`- >>> __ = cachedmethod(lambda args, *kwargs: list(kwargs.values())[0])`
	`31`	`+ >>> __ = cachedmethod(lambda args, *kwargs: next(iter(kwargs.values())))`
`32`	`32`	`>>> __(foobar=3)`
`33`	`33`	`3`
`34`	`34`