Minor code restyling

2026-02-03 03:59:04 +00:00 · 2011-04-30 13:20:05 +00:00
parent 983546d6bf
commit f56d135438
86 changed files with 804 additions and 804 deletions
--- a/extra/chardet/mbcssm.py
+++ b/extra/chardet/mbcssm.py
@@ -129,7 +129,7 @@ EUCJPSMModel = {'classTable': EUCJP_cls,

 # EUC-KR

-EUCKR_cls  = ( \
+EUCKR_cls = ( \
    1,1,1,1,1,1,1,1,  # 00 - 07 
    1,1,1,1,1,1,0,0,  # 08 - 0f 
    1,1,1,1,1,1,1,1,  # 10 - 17 
@@ -371,7 +371,7 @@ UCS2BE_cls = ( \
    0,0,0,0,0,0,0,0,  # f0 - f7 
    0,0,0,0,0,0,4,5)  # f8 - ff 

-UCS2BE_st  = ( \
+UCS2BE_st = ( \
          5,     7,     7,eError,     4,     3,eError,eError,#00-07 
     eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,#08-0f 
     eItsMe,eItsMe,     6,     6,     6,     6,eError,eError,#10-17 
--- a/extra/cloak/cloak.py
+++ b/extra/cloak/cloak.py
@@ -47,7 +47,7 @@ def decloak(inputFile):

 def main():
    usage = '%s [-d] -i <input file> [-o <output file>]' % sys.argv[0]
-    parser  = OptionParser(usage=usage, version='0.1')
+    parser = OptionParser(usage=usage, version='0.1')

    try:
        parser.add_option('-d', dest='decrypt', action="store_true", help='Decrypt')
--- a/extra/dbgtool/dbgtool.py
+++ b/extra/dbgtool/dbgtool.py
@@ -24,13 +24,13 @@ def convert(inputFile):
        print "ERROR: the provided input file '%s' is too big for debug.exe" % inputFile
        sys.exit(1)

-    script     = "n %s\nr cx\n" % os.path.basename(inputFile.replace(".", "_"))
-    script    += "%x\nf 0100 ffff 00\n" % fileSize
-    scrString  = ""
-    counter    = 256
-    counter2   = 0
+    script = "n %s\nr cx\n" % os.path.basename(inputFile.replace(".", "_"))
+    script += "%x\nf 0100 ffff 00\n" % fileSize
+    scrString = ""
+    counter = 256
+    counter2 = 0

-    fp          = open(inputFile, "rb")
+    fp = open(inputFile, "rb")
    fileContent = fp.read()

    for fileChar in fileContent:
@@ -40,20 +40,20 @@ def convert(inputFile):
            counter2 += 1

            if not scrString:
-                scrString  = "e %0x %02x" % (counter, unsignedFileChar)
+                scrString = "e %0x %02x" % (counter, unsignedFileChar)
            else:
                scrString += " %02x" % unsignedFileChar
        elif scrString:
-            script   += "%s\n" % scrString
+            script += "%s\n" % scrString
            scrString = ""
-            counter2  = 0
+            counter2 = 0

        counter += 1

        if counter2 == 20:
-            script    += "%s\n" % scrString
-            scrString  = ""
-            counter2   = 0
+            script += "%s\n" % scrString
+            scrString = ""
+            counter2 = 0

    script += "w\nq\n"

@@ -67,7 +67,7 @@ def main(inputFile, outputFile):
    script = convert(inputFile)

    if outputFile:
-        fpOut      = open(outputFile, "w")
+        fpOut = open(outputFile, "w")
        sys.stdout = fpOut
        sys.stdout.write(script)
        sys.stdout.close()
@@ -76,7 +76,7 @@ def main(inputFile, outputFile):

 if __name__ == "__main__":
    usage = "%s -i <input file> [-o <output file>]" % sys.argv[0]
-    parser  = OptionParser(usage=usage, version="0.1")
+    parser = OptionParser(usage=usage, version="0.1")

    try:
        parser.add_option("-i", dest="inputFile", help="Input binary file")
@@ -91,7 +91,7 @@ if __name__ == "__main__":
    except (OptionError, TypeError), e:
        parser.error(e)

-    inputFile  = args.inputFile
+    inputFile = args.inputFile
    outputFile = args.outputFile

    main(inputFile, outputFile)
--- a/extra/gprof2dot/gprof2dot.py
+++ b/extra/gprof2dot/gprof2dot.py
@@ -657,8 +657,8 @@ class XmlTokenizer:
        self.character_data = ''

        self.parser = xml.parsers.expat.ParserCreate()
-        self.parser.StartElementHandler  = self.handle_element_start
-        self.parser.EndElementHandler    = self.handle_element_end
+        self.parser.StartElementHandler = self.handle_element_start
+        self.parser.EndElementHandler = self.handle_element_end
        self.parser.CharacterDataHandler = self.handle_character_data

    def handle_element_start(self, name, attributes):
--- a/extra/mssqlsig/update.py
+++ b/extra/mssqlsig/update.py
@@ -38,16 +38,16 @@ def updateMSSQLXML():
        mssqlVersionsHtmlString = f.read()
        f.close()
    except urllib2.URLError:
-        __mssqlPath     = urlparse.urlsplit(MSSQL_VERSIONS_URL)
+        __mssqlPath = urlparse.urlsplit(MSSQL_VERSIONS_URL)
        __mssqlHostname = __mssqlPath[1]

-        warnMsg  = "[WARNING] sqlmap was unable to connect to %s," % __mssqlHostname
+        warnMsg = "[WARNING] sqlmap was unable to connect to %s," % __mssqlHostname
        warnMsg += " check your Internet connection and retry"
        print warnMsg

        return

-    releases      = re.findall("class=\"BCC_DV_01DarkBlueTitle\">SQL Server ([\d\.]+) Builds", mssqlVersionsHtmlString, re.I | re.M)
+    releases = re.findall("class=\"BCC_DV_01DarkBlueTitle\">SQL Server ([\d\.]+) Builds", mssqlVersionsHtmlString, re.I | re.M)
    releasesCount = len(releases)

    # Create the minidom document
@@ -73,9 +73,9 @@ def updateMSSQLXML():
        startIdx = mssqlVersionsHtmlString.index("SQL Server %s Builds" % releases[index])

        if index == releasesCount - 1:
-            stopIdx  = len(mssqlVersionsHtmlString)
+            stopIdx = len(mssqlVersionsHtmlString)
        else:
-            stopIdx  = mssqlVersionsHtmlString.index("SQL Server %s Builds" % releases[index + 1])
+            stopIdx = mssqlVersionsHtmlString.index("SQL Server %s Builds" % releases[index + 1])

        mssqlVersionsReleaseString = mssqlVersionsHtmlString[startIdx:stopIdx]
        servicepackVersion = re.findall("</td><td>[7\.0|2000|2005|2008]*(.*?)</td><td.*?([\d\.]+)</td>[\r]*\n", mssqlVersionsReleaseString, re.I | re.M)
@@ -133,7 +133,7 @@ def updateMSSQLXML():
    doc.writexml(writer=mssqlXml, addindent="    ", newl="\n")
    mssqlXml.close()

-    infoMsg  = "[INFO] done. retrieved data parsed and saved into '%s'" % MSSQL_XML
+    infoMsg = "[INFO] done. retrieved data parsed and saved into '%s'" % MSSQL_XML
    print infoMsg

 if __name__ == "__main__":
--- a/extra/safe2bin/safe2bin.py
+++ b/extra/safe2bin/safe2bin.py
@@ -75,7 +75,7 @@ def safechardecode(value):

 def main():
    usage = '%s -i <input file> [-o <output file>]' % sys.argv[0]
-    parser  = OptionParser(usage=usage, version='0.1')
+    parser = OptionParser(usage=usage, version='0.1')

    try:
        parser.add_option('-i', dest='inputFile', help='Input file')
--- a/extra/sqlharvest/sqlharvest.py
+++ b/extra/sqlharvest/sqlharvest.py
@@ -19,15 +19,15 @@ from operator import itemgetter

 def main():

-    TIMEOUT         = 10
-    CONFIG_FILE     = 'sqlharvest.cfg'
-    TABLES_FILE     = 'tables.txt'
-    USER_AGENT      = 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; AskTB5.3)'
-    SEARCH_URL      = 'http://www.google.com/m?source=mobileproducts&dc=gorganic'
-    MAX_FILE_SIZE   = 2*1024*1024 # if a result (.sql) file for downloading is more than 2MB in size just skip it
-    QUERY           = 'CREATE TABLE ext:sql'
-    REGEX_URLS      = r';u=([^"]+)'
-    REGEX_RESULT    = r'CREATE TABLE\s*(/\*.*\*/)?\s*(IF NOT EXISTS)?\s*(?P<result>[^\(;]+)'
+    TIMEOUT = 10
+    CONFIG_FILE = 'sqlharvest.cfg'
+    TABLES_FILE = 'tables.txt'
+    USER_AGENT = 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; AskTB5.3)'
+    SEARCH_URL = 'http://www.google.com/m?source=mobileproducts&dc=gorganic'
+    MAX_FILE_SIZE = 2*1024*1024 # if a result (.sql) file for downloading is more than 2MB in size just skip it
+    QUERY = 'CREATE TABLE ext:sql'
+    REGEX_URLS = r';u=([^"]+)'
+    REGEX_RESULT = r'CREATE TABLE\s*(/\*.*\*/)?\s*(IF NOT EXISTS)?\s*(?P<result>[^\(;]+)'

    tables = dict()
    refiles = re.compile(REGEX_URLS)