Minor code restyling

lib/parse/banner.py

@@ -30,14 +30,14 @@ class MSSQLBannerHandler(ContentHandler):
     def __init__(self, banner, info):
         ContentHandler.__init__(self)
 
-        self.__banner        = sanitizeStr(banner)
-        self.__inVersion     = False
+        self.__banner = sanitizeStr(banner)
+        self.__inVersion = False
         self.__inServicePack = False
-        self.__release       = None
-        self.__version       = ""
-        self.__versionAlt    = None
-        self.__servicePack   = ""
-        self.__info          = info
+        self.__release = None
+        self.__version = ""
+        self.__versionAlt = None
+        self.__servicePack = ""
+        self.__info = info
 
     def __feedInfo(self, key, value):
         value = sanitizeStr(value)
@@ -73,8 +73,8 @@ class MSSQLBannerHandler(ContentHandler):
                     self.__feedInfo("dbmsServicePack", self.__servicePack)
                     break
 
-            self.__version     = ""
-            self.__versionAlt  = None
+            self.__version = ""
+            self.__versionAlt = None
             self.__servicePack = ""
 
         elif name == "version":

lib/parse/cmdline.py

@@ -571,7 +571,7 @@ def cmdLineParser():
 
         if not any([args.direct, args.url, args.list, args.googleDork, args.configFile, \
             args.requestFile, args.updateAll, args.smokeTest, args.liveTest, args.realTest, args.wizard]):
-            errMsg  = "missing a mandatory parameter ('-d', '-u', '-l', '-r', '-g', '-c', '--wizard' or '--update'), "
+            errMsg = "missing a mandatory parameter ('-d', '-u', '-l', '-r', '-g', '-c', '--wizard' or '--update'), "
             errMsg += "-h for help"
             parser.error(errMsg)
 

lib/parse/configfile.py

@@ -42,7 +42,7 @@ def configFileProxy(section, option, boolean=False, integer=False):
         else:
             conf[option] = None
     else:
-        debugMsg  = "missing requested option '%s' (section " % option
+        debugMsg = "missing requested option '%s' (section " % option
         debugMsg += "'%s') into the configuration file, " % section
         debugMsg += "ignoring. Skipping to next."
         logger.debug(debugMsg)
@@ -66,12 +66,12 @@ def configFileParser(configFile):
     if not config.has_section("Target"):
         raise NoSectionError, "Target in the configuration file is mandatory"
 
-    condition  = not config.has_option("Target", "url")
+    condition = not config.has_option("Target", "url")
     condition &= not config.has_option("Target", "list")
     condition &= not config.has_option("Target", "googleDork")
 
     if condition:
-        errMsg  = "missing a mandatory option in the configuration "
+        errMsg = "missing a mandatory option in the configuration "
         errMsg += "file (url, list or googleDork)"
         raise sqlmapMissingMandatoryOptionException, errMsg
 

lib/parse/handler.py

@@ -20,12 +20,12 @@ class FingerprintHandler(ContentHandler):
     def __init__(self, banner, info):
         ContentHandler.__init__(self)
 
-        self.__banner      = sanitizeStr(banner)
-        self.__regexp      = None
-        self.__match       = None
+        self.__banner = sanitizeStr(banner)
+        self.__regexp = None
+        self.__match = None
         self.__dbmsVersion = None
         self.__techVersion = None
-        self.__info        = info
+        self.__info = info
 
     def __feedInfo(self, key, value):
         value = sanitizeStr(value)
@@ -45,7 +45,7 @@ class FingerprintHandler(ContentHandler):
     def startElement(self, name, attrs):
         if name == "regexp":
             self.__regexp = sanitizeStr(attrs.get("value"))
-            self.__match  = re.search(self.__regexp, self.__banner, re.I | re.M)
+            self.__match = re.search(self.__regexp, self.__banner, re.I | re.M)
 
         if name == "info" and self.__match:
             self.__feedInfo("type", attrs.get("type"))
@@ -55,7 +55,7 @@ class FingerprintHandler(ContentHandler):
 
             self.__dbmsVersion = sanitizeStr(attrs.get("dbms_version"))
             self.__techVersion = sanitizeStr(attrs.get("tech_version"))
-            self.__sp          = sanitizeStr(attrs.get("sp"))
+            self.__sp = sanitizeStr(attrs.get("sp"))
 
             if self.__dbmsVersion.isdigit():
                 self.__feedInfo("dbmsVersion", self.__match.group(int(self.__dbmsVersion)))
@@ -68,7 +68,7 @@ class FingerprintHandler(ContentHandler):
             if self.__sp.isdigit():
                 self.__feedInfo("sp", "Service Pack %s" % self.__match.group(int(self.__sp)))
 
-            self.__regexp      = None
-            self.__match       = None
+            self.__regexp = None
+            self.__match = None
             self.__dbmsVersion = None
             self.__techVersion = None

lib/parse/headers.py

@@ -40,7 +40,7 @@ def headersParser(headers):
 
     for header in headers:
         if header in topHeaders.keys():
-            value   = headers[header]
+            value = headers[header]
             xmlfile = topHeaders[header]
 
             checkFile(xmlfile)

lib/parse/html.py

@@ -26,12 +26,12 @@ class htmlHandler(ContentHandler):
     def __init__(self, page):
         ContentHandler.__init__(self)
 
-        self.__dbms   = None
-        self.__page   = page
+        self.__dbms = None
+        self.__page = page
         self.__regexp = None
-        self.__match  = None
+        self.__match = None
 
-        self.dbms     = None
+        self.dbms = None
 
     def startElement(self, name, attrs):
         if name == "dbms":