Minor removal of redundant code

stamparm · stamparm · commit bf18b025d631 · 2014-04-06T18:09:54.000+02:00
diff --git a/lib/core/option.py b/lib/core/option.py
@@ -2034,17 +2034,17 @@ def _basicOptionValidation():
         errMsg = "value for option '--risk' must be an integer value from range [1, 3]"
         raise SqlmapSyntaxException(errMsg)
 
-    if conf.limitStart is not None and isinstance(conf.limitStart, int) and conf.limitStart > 0 and \
-       conf.limitStop is not None and isinstance(conf.limitStop, int) and conf.limitStop < conf.limitStart:
+    if isinstance(conf.limitStart, int) and conf.limitStart > 0 and \
+       isinstance(conf.limitStop, int) and conf.limitStop < conf.limitStart:
         errMsg = "value for option '--start' (limitStart) must be smaller or equal than value for --stop (limitStop) option"
         raise SqlmapSyntaxException(errMsg)
 
-    if conf.firstChar is not None and isinstance(conf.firstChar, int) and conf.firstChar > 0 and \
-       conf.lastChar is not None and isinstance(conf.lastChar, int) and conf.lastChar < conf.firstChar:
+    if isinstance(conf.firstChar, int) and conf.firstChar > 0 and \
+       isinstance(conf.lastChar, int) and conf.lastChar < conf.firstChar:
         errMsg = "value for option '--first' (firstChar) must be smaller than or equal to value for --last (lastChar) option"
         raise SqlmapSyntaxException(errMsg)
 
-    if conf.cpuThrottle is not None and isinstance(conf.cpuThrottle, int) and (conf.cpuThrottle > 100 or conf.cpuThrottle < 0):
+    if isinstance(conf.cpuThrottle, int) and (conf.cpuThrottle > 100 or conf.cpuThrottle < 0):
         errMsg = "value for option '--cpu-throttle' (cpuThrottle) must be in range [0,100]"
         raise SqlmapSyntaxException(errMsg)
 
diff --git a/lib/request/connect.py b/lib/request/connect.py
@@ -191,7 +191,7 @@ def getPage(**kwargs):
         the target URL page content
         """
 
-        if conf.delay is not None and isinstance(conf.delay, (int, float)) and conf.delay > 0:
+        if isinstance(conf.delay, (int, float)) and conf.delay > 0:
             time.sleep(conf.delay)
         elif conf.cpuThrottle:
             cpuThrottle(conf.cpuThrottle)
