Some PEP8 related style cleaning

extra/shutils/pylint.py

@@ -18,7 +18,7 @@ def check(module):
     if module[-3:] == ".py":
 
         print "CHECKING ", module
-        pout = os.popen('pylint --rcfile=/dev/null %s'% module, 'r')
+        pout = os.popen("pylint --rcfile=/dev/null %s" % module, 'r')
         for line in pout:
             if  re.match("E....:.", line):
                 print line
@@ -46,5 +46,5 @@ if __name__ == "__main__":
 
     if __RATING__:
         print "==" * 50
-        print "%d modules found"% count
+        print "%d modules found" % count
-        print "AVERAGE SCORE = %.02f"% (total / count)
+        print "AVERAGE SCORE = %.02f" % (total / count)

extra/sqlharvest/sqlharvest.py

@@ -33,7 +33,7 @@ def main():
     opener.addheaders = [("User-Agent", USER_AGENT)]
 
     conn = opener.open(SEARCH_URL)
-    page = conn.read() #set initial cookie values
+    page = conn.read()  # set initial cookie values
 
     config = ConfigParser.ConfigParser()
     config.read(CONFIG_FILE)
@@ -82,7 +82,7 @@ def main():
                 break
 
             sys.stdout.write("\n---------------\n")
-            sys.stdout.write("Result page #%d\n" % (i+1))
+            sys.stdout.write("Result page #%d\n" % (i + 1))
             sys.stdout.write("---------------\n")
 
             for sqlfile in files:

lib/controller/controller.py

@@ -319,7 +319,7 @@ def start():
                         elif conf.method == HTTPMETHOD.GET:
                             if targetUrl.find("?") > -1:
                                 firstPart = targetUrl[:targetUrl.find("?")]
-                                secondPart = targetUrl[targetUrl.find("?")+1:]
+                                secondPart = targetUrl[targetUrl.find("?") + 1:]
                                 message = "Edit GET data [default: %s]: " % secondPart
                                 test = readInput(message, default=secondPart)
                                 test = _randomFillBlankFields(test)
@@ -617,3 +617,4 @@ def start():
         logger.info(infoMsg)
 
     return True
+

lib/core/agent.py

@@ -758,7 +758,7 @@ class Agent(object):
         limitStr = queries[Backend.getIdentifiedDbms()].limit.query
         fromIndex = limitedQuery.index(" FROM ")
         untilFrom = limitedQuery[:fromIndex]
-        fromFrom = limitedQuery[fromIndex+1:]
+        fromFrom = limitedQuery[fromIndex + 1:]
         orderBy = False
 
         if Backend.getIdentifiedDbms() in (DBMS.MYSQL, DBMS.PGSQL, DBMS.SQLITE):
@@ -766,7 +766,7 @@ class Agent(object):
             limitedQuery += " %s" % limitStr
 
         elif Backend.isDbms(DBMS.FIREBIRD):
-            limitStr = queries[Backend.getIdentifiedDbms()].limit.query % (num+1, num+1)
+            limitStr = queries[Backend.getIdentifiedDbms()].limit.query % (num + 1, num + 1)
             limitedQuery += " %s" % limitStr
 
         elif Backend.getIdentifiedDbms() in (DBMS.ORACLE, DBMS.DB2):

lib/core/common.py

@@ -1489,7 +1489,7 @@ def getConsoleWidth(default=80):
     if os.getenv("COLUMNS", "").isdigit():
         width = int(os.getenv("COLUMNS"))
     else:
-        output=execute('stty size', shell=True, stdout=PIPE, stderr=PIPE).stdout.read()
+        output = execute("stty size", shell=True, stdout=PIPE, stderr=PIPE).stdout.read()
         items = output.split()
 
         if len(items) == 2 and items[1].isdigit():

lib/core/convert.py

@@ -54,8 +54,8 @@ def md5hash(value):
         return md5.new(value).hexdigest()
 
 def orddecode(value):
-    packedString = struct.pack("!"+"I" * len(value), *value)
+    packedString = struct.pack("!" + "I" * len(value), *value)
-    return "".join(chr(char) for char in struct.unpack("!"+"I"*(len(packedString)/4), packedString))
+    return "".join(chr(char) for char in struct.unpack("!" + "I" * (len(packedString) / 4), packedString))
 
 def ordencode(value):
     return tuple(ord(char) for char in value)

lib/core/dicts.py

@@ -69,38 +69,38 @@ SYBASE_TYPES = {
                 }
 
 MYSQL_PRIVS = {
-                    1:"select_priv",
+                    1: "select_priv",
-                    2:"insert_priv",
+                    2: "insert_priv",
-                    3:"update_priv",
+                    3: "update_priv",
-                    4:"delete_priv",
+                    4: "delete_priv",
-                    5:"create_priv",
+                    5: "create_priv",
-                    6:"drop_priv",
+                    6: "drop_priv",
-                    7:"reload_priv",
+                    7: "reload_priv",
-                    8:"shutdown_priv",
+                    8: "shutdown_priv",
-                    9:"process_priv",
+                    9: "process_priv",
-                    10:"file_priv",
+                    10: "file_priv",
-                    11:"grant_priv",
+                    11: "grant_priv",
-                    12:"references_priv",
+                    12: "references_priv",
-                    13:"index_priv",
+                    13: "index_priv",
-                    14:"alter_priv",
+                    14: "alter_priv",
-                    15:"show_db_priv",
+                    15: "show_db_priv",
-                    16:"super_priv",
+                    16: "super_priv",
-                    17:"create_tmp_table_priv",
+                    17: "create_tmp_table_priv",
-                    18:"lock_tables_priv",
+                    18: "lock_tables_priv",
-                    19:"execute_priv",
+                    19: "execute_priv",
-                    20:"repl_slave_priv",
+                    20: "repl_slave_priv",
-                    21:"repl_client_priv",
+                    21: "repl_client_priv",
-                    22:"create_view_priv",
+                    22: "create_view_priv",
-                    23:"show_view_priv",
+                    23: "show_view_priv",
-                    24:"create_routine_priv",
+                    24: "create_routine_priv",
-                    25:"alter_routine_priv",
+                    25: "alter_routine_priv",
-                    26:"create_user_priv",
+                    26: "create_user_priv",
                 }
 
 PGSQL_PRIVS = {
-                    1:"createdb",
+                    1: "createdb",
-                    2:"super",
+                    2: "super",
-                    3:"catupd",
+                    3: "catupd",
                 }
 
 FIREBIRD_PRIVS = {

lib/core/dump.py

@@ -117,13 +117,13 @@ class Dump(object):
         if elements:
             self._write("")
 
-    def banner(self,data):
+    def banner(self, data):
         self.string("banner", data)
 
-    def currentUser(self,data):
+    def currentUser(self, data):
         self.string("current user", data)
 
-    def currentDb(self,data):
+    def currentDb(self, data):
         if Backend.isDbms(DBMS.MAXDB):
             self.string("current database (no practical usage on %s)" % Backend.getIdentifiedDbms(), data)
         elif Backend.isDbms(DBMS.ORACLE):
@@ -131,13 +131,13 @@ class Dump(object):
         else:
             self.string("current database", data)
 
-    def hostname(self,data):
+    def hostname(self, data):
         self.string("hostname", data)
 
-    def dba(self,data):
+    def dba(self, data):
         self.string("current user is DBA", data)
 
-    def users(self,users):
+    def users(self, users):
         self.lister("database management system users", users)
 
     def userSettings(self, header, userSettings, subHeader):
@@ -174,7 +174,7 @@ class Dump(object):
 
         self.singleString("")
 
-    def dbs(self,dbs):
+    def dbs(self, dbs):
         self.lister("available databases", dbs)
 
     def dbTables(self, dbTables):

lib/core/option.py

@@ -272,7 +272,7 @@ def _feedTargetsDict(reqFile, addedTargetUrls):
                         index = 5
 
                     url = line[index:line.index(" HTTP/")]
-                    method = line[:index-1]
+                    method = line[:index - 1]
 
                     if "?" in line and "=" in line:
                         params = True
@@ -587,7 +587,7 @@ def _findPageForms():
         for i in xrange(len(targets)):
             try:
                 target = targets[i]
-                page, _, _= Request.getPage(url=target.strip(), crawling=True, raise404=False)
+                page, _, _ = Request.getPage(url=target.strip(), crawling=True, raise404=False)
                 findPageForms(page, target, False, True)
 
                 if conf.verbose in (1, 2):
@@ -942,7 +942,7 @@ def _setHTTPProxy():
         try:
             port = int(hostnamePort[1])
         except:
-            pass #drops into the next check block
+            pass  # drops into the next check block
 
     if not all((scheme, hasattr(PROXY_TYPE, scheme), hostname, port)):
         errMsg = "proxy value must be in format '(%s)://url:port'" % "|".join(_[0].lower() for _ in getPublicTypeMembers(PROXY_TYPE))
@@ -1373,8 +1373,9 @@ def _cleanupOptions():
         conf.data = re.sub(INJECT_HERE_MARK.replace(" ", r"[^A-Za-z]*"), CUSTOM_INJECTION_MARK_CHAR, conf.data, re.I)
 
         if re.search(r'%[0-9a-f]{2}', conf.data, re.I):
+            class _(unicode):
+                pass
             original = conf.data
-            class _(unicode): pass
             conf.data = _(urldecode(conf.data))
             setattr(conf.data, UNENCODED_ORIGINAL_VALUE, original)
         else:
@@ -1504,7 +1505,7 @@ def _setKnowledgeBaseAttributes(flushAll=True):
     kb.authHeader = None
     kb.bannerFp = AttribDict()
 
-    kb.brute = AttribDict({"tables":[], "columns":[]})
+    kb.brute = AttribDict({"tables": [], "columns": []})
     kb.bruteMode = False
 
     kb.cache = AttribDict()
@@ -1592,7 +1593,7 @@ def _setKnowledgeBaseAttributes(flushAll=True):
     kb.redirectChoice = None
     kb.redirectSetCookie = None
     kb.reflectiveMechanism = True
-    kb.reflectiveCounters = {REFLECTIVE_COUNTER.MISS:0, REFLECTIVE_COUNTER.HIT:0}
+    kb.reflectiveCounters = {REFLECTIVE_COUNTER.MISS: 0, REFLECTIVE_COUNTER.HIT: 0}
     kb.responseTimes = []
     kb.resumeValues = True
     kb.safeCharEncode = False

lib/core/profiling.py

@@ -65,7 +65,7 @@ def profile(profileOutputFile=None, dotOutputFile=None, imageOutputFile=None):
     dotFilePointer = codecs.open(dotOutputFile, 'wt', UNICODE_ENCODING)
     parser = gprof2dot.PstatsParser(profileOutputFile)
     profile = parser.parse()
-    profile.prune(0.5/100.0, 0.1/100.0)
+    profile.prune(0.5 / 100.0, 0.1 / 100.0)
     dot = gprof2dot.DotWriter(dotFilePointer)
     dot.graph(profile, gprof2dot.TEMPERATURE_COLORMAP)
     dotFilePointer.close()

lib/core/purge.py

@@ -64,7 +64,7 @@ def purge(directory):
         except:
             pass
 
-    dirpaths.sort(cmp = lambda x, y: y.count(os.path.sep) - x.count(os.path.sep))
+    dirpaths.sort(cmp=lambda x, y: y.count(os.path.sep) - x.count(os.path.sep))
 
     logger.debug("renaming directory names to random values...")
     for dirpath in dirpaths:

lib/core/replication.py

@@ -61,7 +61,7 @@ class Replication(object):
             """
 
             if len(values) == len(self.columns):
-                self.execute('INSERT INTO "%s" VALUES (%s)' % (self.name, ','.join(['?']*len(values))), safechardecode(values))
+                self.execute('INSERT INTO "%s" VALUES (%s)' % (self.name, ','.join(['?'] * len(values))), safechardecode(values))
             else:
                 errMsg = "wrong number of columns used in replicating insert"
                 raise SqlmapValueException(errMsg)

lib/core/settings.py

@@ -234,7 +234,7 @@ EMPTY_FORM_FIELDS_REGEX = r'(&|\A)(?P<result>[^=]+=(&|\Z))'
 COMMON_PASSWORD_SUFFIXES = ("1", "123", "2", "12", "3", "13", "7", "11", "5", "22", "23", "01", "4", "07", "21", "14", "10", "06", "08", "8", "15", "69", "16", "6", "18")
 
 # Reference: http://www.the-interweb.com/serendipity/index.php?/archives/94-A-brief-analysis-of-40,000-leaked-MySpace-passwords.html
-COMMON_PASSWORD_SUFFIXES += ("!", ".", "*", "!!", "?", ";", "..", "!!!", ",", "@")
+COMMON_PASSWORD_SUFFIXES += ("!", ".", "*", "!!", "?", ";", "..", "!!!", ", ", "@")
 
 # Splitter used between requests in WebScarab log files
 WEBSCARAB_SPLITTER = "### Conversation"
@@ -363,7 +363,7 @@ DUMMY_SQL_INJECTION_CHARS = ";()'"
 DUMMY_USER_INJECTION = r"(?i)[^\w](AND|OR)\s+[^\s]+[=><]"
 
 # Extensions skipped by crawler
-CRAWL_EXCLUDE_EXTENSIONS = ("gif","jpg","jar","tif","bmp","war","ear","mpg","wmv","mpeg","scm","iso","dmp","dll","cab","so","avi","bin","exe","iso","tar","png","pdf","ps","mp3","zip","rar","gz")
+CRAWL_EXCLUDE_EXTENSIONS = ("gif", "jpg", "jar", "tif", "bmp", "war", "ear", "mpg", "wmv", "mpeg", "scm", "iso", "dmp", "dll", "cab", "so", "avi", "bin", "exe", "iso", "tar", "png", "pdf", "ps", "mp3", "zip", "rar", "gz")
 
 # Template used for common table existence check
 BRUTE_TABLE_EXISTS_TEMPLATE = "EXISTS(SELECT %d FROM %s)"
@@ -420,7 +420,7 @@ HASHDB_FLUSH_RETRIES = 3
 HASHDB_MILESTONE_VALUE = "cAWxkLYCQT"  # r5129 "".join(random.sample(string.letters, 10))
 
 # Warn user of possible delay due to large page dump in full UNION query injections
-LARGE_OUTPUT_THRESHOLD = 1024**2
+LARGE_OUTPUT_THRESHOLD = 1024 ** 2
 
 # On huge tables there is a considerable slowdown if every row retrieval requires ORDER BY (most noticable in table dumping using ERROR injections)
 SLOW_ORDER_COUNT_THRESHOLD = 10000

lib/core/subprocessng.py

@@ -142,7 +142,7 @@ class Popen(subprocess.Popen):
             try:
                 written = os.write(self.stdin.fileno(), input)
             except OSError, why:
-                if why[0] == errno.EPIPE: #broken pipe
+                if why[0] == errno.EPIPE:  # broken pipe
                     return self._close('stdin')
                 raise
 
@@ -155,7 +155,7 @@ class Popen(subprocess.Popen):
 
             flags = fcntl.fcntl(conn, fcntl.F_GETFL)
             if not conn.closed:
-                fcntl.fcntl(conn, fcntl.F_SETFL, flags| os.O_NONBLOCK)
+                fcntl.fcntl(conn, fcntl.F_SETFL, flags | os.O_NONBLOCK)
 
             try:
                 if not select.select([conn], [], [], 0)[0]:
@@ -175,7 +175,7 @@ class Popen(subprocess.Popen):
 def recv_some(p, t=.1, e=1, tr=5, stderr=0):
     if tr < 1:
         tr = 1
-    x = time.time()+t
+    x = time.time() + t
     y = []
     r = ''
     if stderr:
@@ -189,7 +189,7 @@ def recv_some(p, t=.1, e=1, tr=5, stderr=0):
         elif r:
             y.append(r)
         else:
-            time.sleep(max((x-time.time())/tr, 0))
+            time.sleep(max((x - time.time()) / tr, 0))
     return ''.join(y)
 
 def send_all(p, data):

lib/parse/cmdline.py

@@ -755,7 +755,7 @@ def cmdLineParser():
         # Expand given mnemonic options (e.g. -z "ign,flu,bat")
         for i in xrange(len(sys.argv) - 1):
             if sys.argv[i] == '-z':
-                expandMnemonics(sys.argv[i+1], parser, args)
+                expandMnemonics(sys.argv[i + 1], parser, args)
 
         if not any((args.direct, args.url, args.logFile, args.bulkFile, args.googleDork, args.configFile, \
             args.requestFile, args.updateAll, args.smokeTest, args.liveTest, args.wizard, args.dependencies, \

lib/request/basic.py

@@ -110,7 +110,7 @@ def checkCharEncoding(encoding, warn=True):
     else:
         return encoding
 
-    # http://www.destructor.de/charsets/index.htm
+    # Reference: http://www.destructor.de/charsets/index.htm
     translate = { "windows-874": "iso-8859-11", "en_us": "utf8", "macintosh": "iso-8859-1", "euc_tw": "big5_tw", "th": "tis-620", "unicode": "utf8",  "utc8": "utf8", "ebcdic": "ebcdic-cp-be"}
 
     for delimiter in (';', ',', '('):
@@ -149,14 +149,14 @@ def checkCharEncoding(encoding, warn=True):
     elif encoding.find("utf8") > 0:
         encoding = "utf8"
 
-    # http://philip.html5.org/data/charsets-2.html
+    # Reference: http://philip.html5.org/data/charsets-2.html
     if encoding in translate:
         encoding = translate[encoding]
     elif encoding in ("null", "{charset}", "*"):
         return None
 
-    # http://www.iana.org/assignments/character-sets
+    # Reference: http://www.iana.org/assignments/character-sets
-    # http://docs.python.org/library/codecs.html
+    # Reference: http://docs.python.org/library/codecs.html
     try:
         codecs.lookup(encoding)
     except LookupError:
@@ -216,7 +216,7 @@ def decodePage(page, contentEncoding, contentType):
     if not conf.charset:
         httpCharset, metaCharset = None, None
 
-        # http://stackoverflow.com/questions/1020892/python-urllib2-read-to-unicode
+        # Reference: http://stackoverflow.com/questions/1020892/python-urllib2-read-to-unicode
         if contentType and (contentType.find("charset=") != -1):
             httpCharset = checkCharEncoding(contentType.split("charset=")[-1])
 

lib/request/certhandler.py

@@ -21,7 +21,7 @@ class HTTPSCertAuthHandler(urllib2.HTTPSHandler):
         return self.do_open(self.getConnection, req)
 
     def getConnection(self, host):
-        if sys.version_info >= (2,6):
+        if sys.version_info >= (2, 6):
             retVal = httplib.HTTPSConnection(host, key_file=self.key_file, cert_file=self.cert_file, timeout=conf.timeout)
         else:
             retVal = httplib.HTTPSConnection(host, key_file=self.key_file, cert_file=self.cert_file)

lib/request/connect.py

@@ -398,7 +398,7 @@ class Connect(object):
                     if url.lower().startswith('http://'):
                         kwargs['url'] = url
                     else:
-                        kwargs['url'] = conf.url[:conf.url.rfind('/')+1] + url
+                        kwargs['url'] = conf.url[:conf.url.rfind('/') + 1] + url
 
                     threadData.lastRedirectMsg = (threadData.lastRequestUID, page)
                     kwargs['refreshing'] = True

lib/request/dns.py

@@ -32,7 +32,7 @@ class DNSQuery(object):
             j = ord(raw[i])
 
             while j != 0:
-                self._query += raw[i+1:i+j+1] + '.'
+                self._query += raw[i + 1:i + j + 1] + '.'
                 i = i + j + 1
                 j = ord(raw[i])
 
@@ -137,4 +137,3 @@ if __name__ == "__main__":
     finally:
         if server:
             server._running = False
-

lib/request/inject.py

@@ -361,7 +361,7 @@ def getValue(expression, blind=True, union=True, error=True, time=True, fromUser
                     found = (value is not None) or (value is None and expectingNone) or count >= MAX_TECHNIQUES_PER_VALUE
 
                 if found and conf.dnsName:
-                    _ = "".join(filter(None, (key if isTechniqueAvailable(value) else None for key, value in {"E":PAYLOAD.TECHNIQUE.ERROR, "Q":PAYLOAD.TECHNIQUE.QUERY, "U":PAYLOAD.TECHNIQUE.UNION}.items())))
+                    _ = "".join(filter(None, (key if isTechniqueAvailable(value) else None for key, value in {"E": PAYLOAD.TECHNIQUE.ERROR, "Q": PAYLOAD.TECHNIQUE.QUERY, "U": PAYLOAD.TECHNIQUE.UNION}.items())))
                     warnMsg = "option '--dns-domain' will be ignored "
                     warnMsg += "as faster techniques are usable "
                     warnMsg += "(%s) " % _

lib/request/proxy.py

@@ -17,7 +17,7 @@ if PYVERSION >= "2.6":
     import ssl
 
 class ProxyHTTPConnection(httplib.HTTPConnection):
-    _ports = {"http" : 80, "https" : 443}
+    _ports = {"http": 80, "https": 443}
 
     def request(self, method, url, body=None, headers={}):
         # Request is called before connect, so can interpret url and get

lib/techniques/blind/inference.py

@@ -157,16 +157,16 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
 
             if hintValue is not None and len(hintValue) >= idx:
                 if Backend.getIdentifiedDbms() in (DBMS.SQLITE, DBMS.ACCESS, DBMS.MAXDB, DBMS.DB2):
-                    posValue = hintValue[idx-1]
+                    posValue = hintValue[idx - 1]
                 else:
-                    posValue = ord(hintValue[idx-1])
+                    posValue = ord(hintValue[idx - 1])
 
                 forgedPayload = safeStringFormat(payload.replace(INFERENCE_GREATER_CHAR, INFERENCE_EQUALS_CHAR), (expressionUnescaped, idx, posValue))
                 result = Request.queryPage(forgedPayload, timeBasedCompare=timeBasedCompare, raise404=False)
                 incrementCounter(kb.technique)
 
                 if result:
-                    return hintValue[idx-1]
+                    return hintValue[idx - 1]
 
             with hintlock:
                 kb.hintValue = None
@@ -406,7 +406,7 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
                                 if startCharIndex > 0:
                                     output = '..' + output[2:]
 
-                                if (endCharIndex - startCharIndex == conf.progressWidth) and (endCharIndex < length-1):
+                                if (endCharIndex - startCharIndex == conf.progressWidth) and (endCharIndex < length - 1):
                                     output = output[:-2] + '..'
 
                                 if conf.verbose in (1, 2) and not showEta:
@@ -471,7 +471,7 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
                             if showEta:
                                 etaProgressUpdate(time.time() - charStart, len(commonValue))
                             elif conf.verbose in (1, 2):
-                                dataToStdout(filterControlChars(commonValue[index-1:]))
+                                dataToStdout(filterControlChars(commonValue[index - 1:]))
 
                             finalValue = commonValue
 
@@ -490,8 +490,8 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
 
                         # Did we have luck?
                         if result:
-                            val = commonPattern[index-1:]
+                            val = commonPattern[index - 1:]
-                            index += len(val)-1
+                            index += len(val) - 1
 
                     # Otherwise if there is no commonValue (single match from
                     # txt/common-outputs.txt) and no commonPattern

lib/techniques/union/test.py

@@ -100,7 +100,7 @@ def _findUnionCharCount(comment, place, parameter, value, prefix, suffix, where=
     min_, max_ = MAX_RATIO, MIN_RATIO
     pages = {}
 
-    for count in xrange(lowerCount, upperCount+1):
+    for count in xrange(lowerCount, upperCount + 1):
         query = agent.forgeUnionQuery('', -1, count, comment, prefix, suffix, kb.uChar, where)
         payload = agent.payload(place=place, parameter=parameter, newValue=query, where=where)
         page, headers = Request.queryPage(payload, place=place, content=True, raise404=False)

lib/utils/api.py

@@ -324,7 +324,7 @@ def scan_log_limited(taskid, start, end):
     if not start.isdigit() or not end.isdigit() or end <= start:
         abort(500, "Invalid start or end value, must be digits")
 
-    start = max(0, int(start)-1)
+    start = max(0, int(start) - 1)
     end = max(1, int(end))
     pickledLog = os.read(pipes[taskid][0], 100000)
 

lib/utils/getch.py

@@ -19,7 +19,8 @@ class _Getch(object):
             except(AttributeError, ImportError):
                 self.impl = _GetchUnix()
 
-    def __call__(self): return self.impl()
+    def __call__(self):
+        return self.impl()
 
 
 class _GetchUnix(object):
@@ -56,11 +57,11 @@ class _GetchMacCarbon(object):
     """
     def __init__(self):
         import Carbon
-        Carbon.Evt #see if it has this (in Unix, it doesn't)
+        Carbon.Evt  # see if it has this (in Unix, it doesn't)
 
     def __call__(self):
         import Carbon
-        if Carbon.Evt.EventAvail(0x0008)[0]==0: # 0x0008 is the keyDownMask
+        if Carbon.Evt.EventAvail(0x0008)[0] == 0:  # 0x0008 is the keyDownMask
             return ''
         else:
             #
@@ -72,8 +73,9 @@ class _GetchMacCarbon(object):
             # number is converted to an ASCII character with chr() and
             # returned
             #
-            (what,msg,when,where,mod)=Carbon.Evt.GetNextEvent(0x0008)[1]
+            (what, msg, when, where, mod) = Carbon.Evt.GetNextEvent(0x0008)[1]
             return chr(msg & 0x000000FF)
 
 
 getch = _Getch()
+

lib/utils/google.py

@@ -61,7 +61,7 @@ class Google(object):
         url = "http://www.google.com/search?"
         url += "q=%s&" % urlencode(dork, convall=True)
         url += "num=100&hl=en&complete=0&safe=off&filter=0&btnG=Search"
-        url += "&start=%d" % ((gpage-1) * 100)
+        url += "&start=%d" % ((gpage - 1) * 100)
 
         try:
             conn = self.opener.open(url)

lib/utils/hash.py

@@ -167,7 +167,7 @@ def oracle_passwd(password, salt, uppercase=True):
 
     binsalt = hexdecode(salt)
 
-    retVal="s:%s%s" % (sha1(utf8encode(password) + binsalt).hexdigest(), salt)
+    retVal = "s:%s%s" % (sha1(utf8encode(password) + binsalt).hexdigest(), salt)
 
     return retVal.upper() if uppercase else retVal.lower()
 
@@ -180,10 +180,10 @@ def oracle_old_passwd(password, username, uppercase=True): # prior to version '1
     'F894844C34402B67'
     """
 
-    IV, pad = "\0"*8, "\0"
+    IV, pad = "\0" * 8, "\0"
 
     if isinstance(username, unicode):
-        username = unicode.encode(username, UNICODE_ENCODING) #pyDes has issues with unicode strings
+        username = unicode.encode(username, UNICODE_ENCODING)  # pyDes has issues with unicode strings
 
     unistr = "".join("\0%s" % c for c in (username + password).upper())
 
@@ -255,7 +255,7 @@ def wordpress_passwd(password, salt, count, prefix, uppercase=False):
             if i < count:
                 value = value | (ord(input_[i]) << 8)
 
-            output = output + ITOA64[(value>>6) & 0x3f]
+            output = output + ITOA64[(value >> 6) & 0x3f]
 
             i += 1
             if i >= count:
@@ -264,13 +264,13 @@ def wordpress_passwd(password, salt, count, prefix, uppercase=False):
             if i < count:
                 value = value | (ord(input_[i]) << 16)
 
-            output = output + ITOA64[(value>>12) & 0x3f]
+            output = output + ITOA64[(value >> 12) & 0x3f]
 
             i += 1
             if i >= count:
                 break
 
-            output = output + ITOA64[(value>>18) & 0x3f]
+            output = output + ITOA64[(value >> 18) & 0x3f]
 
         return output
 
@@ -463,7 +463,7 @@ def _bruteProcessVariantA(attack_info, hash_regex, suffix, retVal, proc_id, proc
                 word = word + suffix
 
             try:
-                current = __functions__[hash_regex](password = word, uppercase = False)
+                current = __functions__[hash_regex](password=word, uppercase=False)
 
                 count += 1
 
@@ -523,7 +523,7 @@ def _bruteProcessVariantB(user, hash_, kwargs, hash_regex, suffix, retVal, found
             if found.value:
                 break
 
-            current = __functions__[hash_regex](password = word, uppercase = False, **kwargs)
+            current = __functions__[hash_regex](password=word, uppercase=False, **kwargs)
             count += 1
 
             if not isinstance(word, basestring):
@@ -534,7 +534,7 @@ def _bruteProcessVariantB(user, hash_, kwargs, hash_regex, suffix, retVal, found
 
             try:
                 if hash_ == current:
-                    if hash_regex == HASH.ORACLE_OLD: #only for cosmetic purposes
+                    if hash_regex == HASH.ORACLE_OLD:  # only for cosmetic purposes
                         word = word.upper()
 
                     retVal.put((user, hash_, word))
@@ -629,7 +629,7 @@ def dictionaryAttack(attack_dict):
                     elif hash_regex in (HASH.CRYPT_GENERIC):
                         item = [(user, hash_), {'salt': hash_[0:2]}]
                     elif hash_regex in (HASH.WORDPRESS):
-                        item = [(user, hash_), {'salt': hash_[4:12], 'count': 1<<ITOA64.index(hash_[3]), 'prefix': hash_[:12]}]
+                        item = [(user, hash_), {'salt': hash_[4:12], 'count': 1 << ITOA64.index(hash_[3]), 'prefix': hash_[:12]}]
 
                     if item and hash_ not in keys:
                         resumed = hashDBRetrieve(hash_)

plugins/dbms/db2/enumeration.py

@@ -18,3 +18,4 @@ class Enumeration(GenericEnumeration):
         logger.warn(warnMsg)
 
         return {}
+

plugins/dbms/firebird/connector.py

@@ -40,7 +40,7 @@ class Connector(GenericConnector):
 
         try:
             self.connector = kinterbasdb.connect(host=self.hostname.encode(UNICODE_ENCODING), database=self.db.encode(UNICODE_ENCODING), \
-                user=self.user.encode(UNICODE_ENCODING), password=self.password.encode(UNICODE_ENCODING), charset="UTF8") #http://www.daniweb.com/forums/thread248499.html
+                user=self.user.encode(UNICODE_ENCODING), password=self.password.encode(UNICODE_ENCODING), charset="UTF8")  # Reference: http://www.daniweb.com/forums/thread248499.html
         except kinterbasdb.OperationalError, msg:
             raise SqlmapConnectionException(msg[1])
         self.setCursor()

plugins/dbms/firebird/fingerprint.py

@@ -70,16 +70,16 @@ class Fingerprint(GenericFingerprint):
     def _sysTablesCheck(self):
         retVal = None
         table = (
-                    ("1.0", ["EXISTS(SELECT CURRENT_USER FROM RDB$DATABASE)"]),
+                    ("1.0", ("EXISTS(SELECT CURRENT_USER FROM RDB$DATABASE)",)),
-                    ("1.5", ["NULLIF(%d,%d) IS NULL", "EXISTS(SELECT CURRENT_TRANSACTION FROM RDB$DATABASE)"]),
+                    ("1.5", ("NULLIF(%d,%d) IS NULL", "EXISTS(SELECT CURRENT_TRANSACTION FROM RDB$DATABASE)")),
-                    ("2.0", ["EXISTS(SELECT CURRENT_TIME(0) FROM RDB$DATABASE)", "BIT_LENGTH(%d)>0", "CHAR_LENGTH(%d)>0"]),
+                    ("2.0", ("EXISTS(SELECT CURRENT_TIME(0) FROM RDB$DATABASE)", "BIT_LENGTH(%d)>0", "CHAR_LENGTH(%d)>0")),
-                    ("2.1", ["BIN_XOR(%d,%d)=0", "PI()>0.%d", "RAND()<1.%d", "FLOOR(1.%d)>=0"])
+                    ("2.1", ("BIN_XOR(%d,%d)=0", "PI()>0.%d", "RAND()<1.%d", "FLOOR(1.%d)>=0"))
                  )
 
         for i in xrange(len(table)):
             version, checks = table[i]
             failed = False
-            check = checks[randomRange(0, len(checks)-1)].replace("%d", getUnicode(randomRange(1,100)))
+            check = checks[randomRange(0, len(checks) - 1)].replace("%d", getUnicode(randomRange(1, 100)))
             result = inject.checkBooleanExpression(check)
 
             if result:

plugins/dbms/maxdb/enumeration.py

@@ -148,7 +148,7 @@ class Enumeration(GenericEnumeration):
 
             randStr = randomStr()
             query = rootQuery.inband.query % (unsafeSQLIdentificatorNaming(tbl), ("'%s'" % unsafeSQLIdentificatorNaming(conf.db)) if unsafeSQLIdentificatorNaming(conf.db) != "USER" else 'USER')
-            retVal = pivotDumpTable("(%s) AS %s" % (query, randStr), ['%s.columnname' % randStr,'%s.datatype' % randStr,'%s.len' % randStr], blind=True)
+            retVal = pivotDumpTable("(%s) AS %s" % (query, randStr), ['%s.columnname' % randStr, '%s.datatype' % randStr, '%s.len' % randStr], blind=True)
 
             if retVal:
                 table = {}

plugins/dbms/mssqlserver/filesystem.py

@@ -44,7 +44,7 @@ class Filesystem(GenericFilesystem):
         for fileLine in xrange(0, len(fileContent), lineLen):
             scrString = ""
 
-            for lineChar in fileContent[fileLine:fileLine+lineLen]:
+            for lineChar in fileContent[fileLine:fileLine + lineLen]:
                 strLineChar = hexencode(lineChar)
 
                 if not scrString:

plugins/dbms/mssqlserver/takeover.py

@@ -68,7 +68,7 @@ class Takeover(GenericTakeover):
         hexStr = binascii.hexlify(self.shellcodeString[:-1])
 
         for hexPair in xrange(0, len(hexStr), 2):
-            shellcodeChar += "CHAR(0x%s)+" % hexStr[hexPair:hexPair+2]
+            shellcodeChar += "CHAR(0x%s)+" % hexStr[hexPair:hexPair + 2]
 
         shellcodeChar = shellcodeChar[:-1]
 

plugins/dbms/mysql/fingerprint.py

@@ -206,7 +206,7 @@ class Fingerprint(GenericFingerprint):
                 elif inject.checkBooleanExpression("@@table_open_cache=@@table_open_cache"):
                     if inject.checkBooleanExpression("%s=(SELECT %s FROM information_schema.GLOBAL_STATUS LIMIT 0, 1)" % (randInt, randInt)):
                         Backend.setVersionList([">= 5.1.12", "< 5.5.0"])
-                    elif inject.checkBooleanExpression("%s=(SELECT %s FROM information_schema.PROCESSLIST LIMIT 0, 1)" % (randInt,randInt)):
+                    elif inject.checkBooleanExpression("%s=(SELECT %s FROM information_schema.PROCESSLIST LIMIT 0, 1)" % (randInt, randInt)):
                         Backend.setVersionList([">= 5.1.7", "< 5.1.12"])
                     elif inject.checkBooleanExpression("%s=(SELECT %s FROM information_schema.PARTITIONS LIMIT 0, 1)" % (randInt, randInt)):
                         Backend.setVersion("= 5.1.6")

plugins/dbms/sqlite/syntax.py

@@ -39,7 +39,7 @@ class Syntax(GenericSyntax):
                 break
 
             firstIndex = index
-            index = expression[firstIndex+2:].find("'")
+            index = expression[firstIndex + 2:].find("'")
 
             if index == -1:
                 raise SqlmapSyntaxException("Unenclosed ' in '%s'" % expression)
@@ -49,8 +49,8 @@ class Syntax(GenericSyntax):
             oldUpper = old.upper()
             oldUpper = oldUpper.replace("X'", "").replace("'", "")
 
-            for i in xrange(len(oldUpper)/2):
+            for i in xrange(len(oldUpper) / 2):
-                char = oldUpper[i*2:i*2+2]
+                char = oldUpper[i * 2:i * 2 + 2]
                 escaped = "'%s'" % chr(int(char, 16))
             expression = expression.replace(old, escaped)
 

plugins/dbms/sybase/enumeration.py

@@ -233,7 +233,7 @@ class Enumeration(GenericEnumeration):
             for blind in blinds:
                 randStr = randomStr()
                 query = rootQuery.inband.query % (conf.db, conf.db, conf.db, conf.db, conf.db, conf.db, conf.db, unsafeSQLIdentificatorNaming(tbl))
-                retVal = pivotDumpTable("(%s) AS %s" % (query, randStr), ['%s.name' % randStr,'%s.usertype' % randStr], blind=blind)
+                retVal = pivotDumpTable("(%s) AS %s" % (query, randStr), ['%s.name' % randStr, '%s.usertype' % randStr], blind=blind)
 
                 if retVal:
                     table = {}

plugins/generic/filesystem.py

@@ -115,7 +115,7 @@ class Filesystem:
         if not single:
             if len(content) > 256:
                 for i in xrange(0, len(content), 256):
-                    _ = content[i:i+256]
+                    _ = content[i:i + 256]
 
                     if encoding == "hex":
                         _ = "0x%s" % _

plugins/generic/takeover.py

@@ -184,9 +184,9 @@ class Takeover(Abstraction, Metasploit, ICMPsh, Registry, Miscellaneous):
                         goUdf = True
 
                 if goUdf:
-                    exitfunc="thread"
+                    exitfunc = "thread"
                 else:
-                    exitfunc="process"
+                    exitfunc = "process"
 
                 self.createMsfShellcode(exitfunc=exitfunc, format="raw", extra="BufferRegister=EAX", encode="x86/alpha_mixed")
 

tamper/between.py

@@ -55,9 +55,9 @@ def tamper(payload, **kwargs):
                 doublequote = not doublequote
 
             elif payload[i] == ">" and not doublequote and not quote:
-                retVal += " " if i > 0 and not payload[i-1].isspace() else ""
+                retVal += " " if i > 0 and not payload[i - 1].isspace() else ""
-                retVal += "NOT BETWEEN %s AND" % ('0' if re.search(r"\A[^\w]*\d", payload[i+1:]) else "NULL")
+                retVal += "NOT BETWEEN %s AND" % ('0' if re.search(r"\A[^\w]*\d", payload[i + 1:]) else "NULL")
-                retVal += " " if i < len(payload) - 1 and not payload[i+1:i+2].isspace() else ""
+                retVal += " " if i < len(payload) - 1 and not payload[i + 1:i + 2].isspace() else ""
 
                 continue
 

tamper/chardoubleencode.py

@@ -36,8 +36,8 @@ def tamper(payload, **kwargs):
         i = 0
 
         while i < len(payload):
-            if payload[i] == '%' and (i < len(payload) - 2) and payload[i+1:i+2] in string.hexdigits and payload[i+2:i+3] in string.hexdigits:
+            if payload[i] == '%' and (i < len(payload) - 2) and payload[i + 1:i + 2] in string.hexdigits and payload[i + 2:i + 3] in string.hexdigits:
-                retVal += payload[i:i+3]
+                retVal += payload[i:i + 3]
                 i += 3
             else:
                 retVal += '%%25%.2X' % ord(payload[i])

tamper/charencode.py

@@ -43,8 +43,8 @@ def tamper(payload, **kwargs):
         i = 0
 
         while i < len(payload):
-            if payload[i] == '%' and (i < len(payload) - 2) and payload[i+1:i+2] in string.hexdigits and payload[i+2:i+3] in string.hexdigits:
+            if payload[i] == '%' and (i < len(payload) - 2) and payload[i + 1:i + 2] in string.hexdigits and payload[i + 2:i + 3] in string.hexdigits:
-                retVal += payload[i:i+3]
+                retVal += payload[i:i + 3]
                 i += 3
             else:
                 retVal += '%%%.2X' % ord(payload[i])

tamper/charunicodeencode.py

@@ -48,8 +48,8 @@ def tamper(payload, **kwargs):
         i = 0
 
         while i < len(payload):
-            if payload[i] == '%' and (i < len(payload) - 2) and payload[i+1:i+2] in string.hexdigits and payload[i+2:i+3] in string.hexdigits:
+            if payload[i] == '%' and (i < len(payload) - 2) and payload[i + 1:i + 2] in string.hexdigits and payload[i + 2:i + 3] in string.hexdigits:
-                retVal += "%%u00%s" % payload[i+1:i+3]
+                retVal += "%%u00%s" % payload[i + 1:i + 3]
                 i += 3
             else:
                 retVal += '%%u%.4X' % ord(payload[i])

tamper/ifnull2ifisnull.py

@@ -57,7 +57,7 @@ def tamper(payload, **kwargs):
                 _ = payload[index + len("IFNULL("):comma]
                 __ = payload[comma + 1:end]
                 newVal = "IF(ISNULL(%s),%s,%s)" % (_, __, _)
-                payload = payload[:index] + newVal + payload[end+1:]
+                payload = payload[:index] + newVal + payload[end + 1:]
             else:
                 break
 

tamper/multiplespaces.py

@@ -43,7 +43,7 @@ def tamper(payload, **kwargs):
                 words.add(word)
 
         for word in words:
-            retVal = re.sub("(?<=\W)%s(?=[^A-Za-z_(]|\Z)" % word, "%s%s%s" % (' '*random.randrange(1,4), word, ' '*random.randrange(1,4)), retVal)
+            retVal = re.sub("(?<=\W)%s(?=[^A-Za-z_(]|\Z)" % word, "%s%s%s" % (' ' * random.randrange(1, 4), word, ' ' * random.randrange(1, 4)), retVal)
-            retVal = re.sub("(?<=\W)%s(?=[(])" % word, "%s%s" % (' '*random.randrange(1,4), word), retVal)
+            retVal = re.sub("(?<=\W)%s(?=[(])" % word, "%s%s" % (' ' * random.randrange(1, 4), word), retVal)
 
     return retVal

tamper/percentage.py

@@ -41,8 +41,8 @@ def tamper(payload, **kwargs):
         i = 0
 
         while i < len(payload):
-            if payload[i] == '%' and (i < len(payload) - 2) and payload[i+1:i+2] in string.hexdigits and payload[i+2:i+3] in string.hexdigits:
+            if payload[i] == '%' and (i < len(payload) - 2) and payload[i + 1:i + 2] in string.hexdigits and payload[i + 2:i + 3] in string.hexdigits:
-                retVal += payload[i:i+3]
+                retVal += payload[i:i + 3]
                 i += 3
             elif payload[i] != ' ':
                 retVal += '%%%s' % payload[i]

tamper/space2comment.py

@@ -49,7 +49,7 @@ def tamper(payload, **kwargs):
             elif payload[i] == '"':
                 doublequote = not doublequote
 
-            elif payload[i]==" " and not doublequote and not quote:
+            elif payload[i] == " " and not doublequote and not quote:
                 retVal += "/**/"
                 continue
 

tamper/space2dash.py

@@ -40,7 +40,7 @@ def tamper(payload, **kwargs):
             if payload[i].isspace():
                 randomStr = ''.join(random.choice(string.ascii_uppercase + string.lowercase) for _ in xrange(random.randint(6, 12)))
                 retVal += "--%s%%0A" % randomStr
-            elif payload[i] == '#' or payload[i:i+3] == '-- ':
+            elif payload[i] == '#' or payload[i:i + 3] == '-- ':
                 retVal += payload[i:]
                 break
             else:

tamper/space2hash.py

@@ -46,7 +46,7 @@ def tamper(payload, **kwargs):
             if payload[i].isspace():
                 randomStr = ''.join(random.choice(string.ascii_uppercase + string.lowercase) for _ in xrange(random.randint(6, 12)))
                 retVal += "%%23%s%%0A" % randomStr
-            elif payload[i] == '#' or payload[i:i+3] == '-- ':
+            elif payload[i] == '#' or payload[i:i + 3] == '-- ':
                 retVal += payload[i:]
                 break
             else:

tamper/space2morehash.py

@@ -60,7 +60,7 @@ def tamper(payload, **kwargs):
             if payload[i].isspace():
                 randomStr = ''.join(random.choice(string.ascii_uppercase + string.lowercase) for _ in xrange(random.randint(6, 12)))
                 retVal += "%%23%s%%0A" % randomStr
-            elif payload[i] == '#' or payload[i:i+3] == '-- ':
+            elif payload[i] == '#' or payload[i:i + 3] == '-- ':
                 retVal += payload[i:]
                 break
             else:

tamper/space2mssqlblank.py

@@ -73,7 +73,7 @@ def tamper(payload, **kwargs):
             elif payload[i] == '"':
                 doublequote = not doublequote
 
-            elif payload[i] == '#' or payload[i:i+3] == '-- ':
+            elif payload[i] == '#' or payload[i:i + 3] == '-- ':
                 end = True
 
             elif payload[i] == " " and not doublequote and not quote:

tamper/space2mssqlhash.py

@@ -32,7 +32,7 @@ def tamper(payload, **kwargs):
         for i in xrange(len(payload)):
             if payload[i].isspace():
                 retVal += "%23%0A"
-            elif payload[i] == '#' or payload[i:i+3] == '-- ':
+            elif payload[i] == '#' or payload[i:i + 3] == '-- ':
                 retVal += payload[i:]
                 break
             else:

tamper/space2mysqldash.py

@@ -41,7 +41,7 @@ def tamper(payload, **kwargs):
         for i in xrange(len(payload)):
             if payload[i].isspace():
                 retVal += "--%0A"
-            elif payload[i] == '#' or payload[i:i+3] == '-- ':
+            elif payload[i] == '#' or payload[i:i + 3] == '-- ':
                 retVal += payload[i:]
                 break
             else:

tamper/space2plus.py

@@ -45,7 +45,7 @@ def tamper(payload, **kwargs):
             elif payload[i] == '"':
                 doublequote = not doublequote
 
-            elif payload[i]==" " and not doublequote and not quote:
+            elif payload[i] == " " and not doublequote and not quote:
                 retVal += "+"
                 continue