Some PEP8 related style cleaning

tamper/__init__.py

@@ -5,4 +5,4 @@ Copyright (c) 2006-2012 sqlmap developers (http://sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
-pass
+pass

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 += "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 > 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 += " " 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:
-                retVal += payload[i:i+3]
+            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]
                 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:
-                retVal += payload[i:i+3]
+            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]
                 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:
-                retVal += "%%u00%s" % payload[i+1:i+3]
+            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]
                 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(?=[(])" % word, "%s%s" % (' '*random.randrange(1,4), word), 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)
 
     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:
-                retVal += payload[i:i+3]
+            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]
                 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