Minor refactoring

stamparm · stamparm · commit 805120ac5293 · 2012-07-14T11:01:30.000+02:00
diff --git a/lib/controller/controller.py b/lib/controller/controller.py
@@ -399,7 +399,7 @@ def start():
                     if skip:
                         continue
 
-                    if not conf.paramDict.has_key(place):
+                    if place not in conf.paramDict:
                         continue
 
                     paramDict = conf.paramDict[place]
diff --git a/lib/core/target.py b/lib/core/target.py
@@ -62,7 +62,7 @@ def __setRequestParams():
     testableParameters = False
 
     # Perform checks on GET parameters
-    if conf.parameters.has_key(PLACE.GET) and conf.parameters[PLACE.GET]:
+    if conf.parameters.get(PLACE.GET):
         parameters = conf.parameters[PLACE.GET]
         paramDict = paramToDict(PLACE.GET, parameters)
 
diff --git a/lib/request/connect.py b/lib/request/connect.py
@@ -236,7 +236,7 @@ def getPage(**kwargs):
                 pass
 
             elif target:
-                if conf.parameters.has_key(PLACE.GET) and not get:
+                if PLACE.GET in conf.parameters and not get:
                     get = conf.parameters[PLACE.GET]
 
                 if get:
@@ -245,7 +245,7 @@ def getPage(**kwargs):
 
                 if conf.method == HTTPMETHOD.POST and not post:
                     for place in (PLACE.POST, PLACE.SOAP):
-                        if conf.parameters.has_key(place):
+                        if place in conf.parameters:
                             post = conf.parameters[place]
                             break
 
diff --git a/lib/techniques/brute/use.py b/lib/techniques/brute/use.py
@@ -123,7 +123,7 @@ def tableExistsThread():
         logger.warn(warnMsg)
     else:
         for item in threadData.shared.outputs:
-            if not kb.data.cachedTables.has_key(conf.db):
+            if conf.db not in kb.data.cachedTables:
                 kb.data.cachedTables[conf.db] = [item]
             else:
                 kb.data.cachedTables[conf.db].append(item)
