fix(py3): change to py3 syntax

Signed-off-by: Felipe Zipitria <felipe.zipitria@owasp.org>

Author: fzipi

apitest.py

@@ -7,7 +7,7 @@
 from libinjection import *
 from words import words
 
-print dir(libinjection)
+print(dir(libinjection))
 
 def print_token_string(tok):
     """
@@ -55,4 +55,4 @@ def lookup(state, stype, keyword):
 sqli_callback(s, lookup)
 
 while sqli_tokenize(s):
-    print print_token(s.current)
+    print(print_token(s.current))

json2python.py

@@ -12,7 +12,7 @@
 def toc(obj):
     """ main routine """
 
-    print """
+    print("""
 import libinjection
 
 def lookup(state, stype, keyword):
@@ -24,24 +24,24 @@ def lookup(state, stype, keyword):
             return chr(0)
     return words.get(keyword, chr(0))
 
-"""
+""")
 
     words = {}
     keywords = obj['keywords']
-    for k,v in keywords.iteritems():
+    for k,v in keywords.items():
         words[str(k)] = str(v)
 
-    print 'words = {'
+    print('words = {')
     for k in sorted(words.keys()):
-        print "'{0}': '{1}',".format(k, words[k])
-    print '}\n'
+        print("'{0}': '{1}',".format(k, words[k]))
+    print('}\n')
 
 
     keywords = obj['fingerprints']
-    print 'fingerprints = set(['
+    print('fingerprints = set([')
     for k in sorted(keywords):
-        print "'{0}',".format(k.upper())
-    print '])'
+        print("'{0}',".format(k.upper()))
+    print('])')
 
     return 0
 

pytest.py

@@ -6,30 +6,30 @@
 
 if False:
     s = sfilter()
-    print sqli_fingerprint(s, sqli, CHAR_NULL, COMMENTS_ANSI)
-    print "----"
+    print(sqli_fingerprint(s, sqli, CHAR_NULL, COMMENTS_ANSI))
+    print("----")
 
 if False:
     s = sfilter()
     current = stoken_t()
     sqli_init(s, sqli, CHAR_NULL, COMMENTS_ANSI)
     while sqli_tokenize(s, current):
-        print current.type, current.val
-    print "----"
+        print(current.type, current.val)
+    print("----")
 
 def is_pattern(state):
     return sqli_blacklist(state) and sqli_not_whitelist(state)
 
 s = sfilter()
 
 if is_sqli(s, sqli, None):
-    print "IS SQLI"
-    print len(s.pat)
-    print s.current.val
-    print s.current.type
+    print("IS SQLI")
+    print(len(s.pat))
+    print(s.current.val)
+    print(s.current.type)
     vec = s.tokenvec
     for i in range(len(s.pat)):
         atoken = vec[i]
-        print atoken.type, atoken.val
+        print(atoken.type, atoken.val)
 else:
-    print "IS NOT SQLI"
+    print("IS NOT SQLI")

speedtest.py

@@ -36,58 +36,58 @@ def main():
 
     t0 = clock()
     sfilter = sqli_state()
-    for i in xrange(imax):
+    for i in range(imax):
         s = inputs[i % 7]
         sqli_init(sfilter, s, 0)
         is_sqli(sfilter)
     t1 = clock()
     total = imax / (t1 - t0)
-    print("python->c TPS            = {0}".format(total))
+    print(("python->c TPS            = {0}".format(total)))
 
     t0 = clock()
     sfilter = sqli_state()
-    for i in xrange(imax):
+    for i in range(imax):
         s = inputs[i % 7]
         sqli_init(sfilter, s, 0)
         sqli_callback(sfilter, lookup_null)
         is_sqli(sfilter)
     t1 = clock()
     total = imax / (t1 - t0)
-    print("python lookup_null TPS    = {0}".format(total))
+    print(("python lookup_null TPS    = {0}".format(total)))
 
     t0 = clock()
     sfilter = sqli_state()
-    for i in xrange(imax):
+    for i in range(imax):
         s = inputs[i % 7]
         sqli_init(sfilter, s, 0)
         sqli_callback(sfilter, lookup_upcase)
         is_sqli(sfilter)
     t1 = clock()
     total = imax / (t1 - t0)
-    print("python lookup_upcase TPS    = {0}".format(total))
+    print(("python lookup_upcase TPS    = {0}".format(total)))
 
     t0 = clock()
     sfilter = sqli_state()
-    for i in xrange(imax):
+    for i in range(imax):
         s = inputs[i % 7]
         sqli_init(sfilter, s, 0)
         sqli_callback(sfilter, lookup_c)
         is_sqli(sfilter)
     t1 = clock()
     total = imax / (t1 - t0)
-    print("python lookup_c TPS    = {0}".format(total))
+    print(("python lookup_c TPS    = {0}".format(total)))
 
 
     t0 = clock()
     sfilter = sqli_state()
-    for i in xrange(imax):
+    for i in range(imax):
         s = inputs[i % 7]
         sqli_init(sfilter, s, 0)
         sqli_callback(sfilter, lookup)
         is_sqli(sfilter)
     t1 = clock()
     total = imax / (t1 - t0)
-    print("python lookup TPS = {0}".format(total))
+    print(("python lookup TPS = {0}".format(total)))
 
 
 if __name__ == '__main__':

test_driver.py

@@ -8,7 +8,7 @@
 from libinjection import *
 from words import *
 
-print version()
+print(version())
 
 def print_token_string(tok):
     """
@@ -105,11 +105,11 @@ def runtest(testname, flag, sqli_flags):
     actual = actual.strip()
 
     if actual != data[2]:
-        print "INPUT: \n" + toascii(data[1])
-        print
-        print "EXPECTED: \n" + toascii(data[2])
-        print
-        print "GOT: \n" + toascii(actual)
+        print("INPUT: \n" + toascii(data[1]))
+        print()
+        print("EXPECTED: \n" + toascii(data[2]))
+        print()
+        print("GOT: \n" + toascii(actual))
         assert actual == data[2]
 
 def test_tokens():