From 85a77e3eff41a330de8b9f7730095908bafab862 Mon Sep 17 00:00:00 2001 From: Jan Henning Date: Thu, 19 May 2022 16:25:08 +0200 Subject: [PATCH] Bump scripts to python3 --- CMakeLists.txt | 3 +-- cmake/formatdate.py | 2 +- tools/fuzz/aristocrats.py | 10 +++++----- tools/fuzz/completocrats.py | 6 +++--- tools/fuzz/heuristocrats.py | 16 ++++++++-------- tools/hsbench/scripts/gutenbergCorpus.py | 12 ++++++------ tools/hsbench/scripts/linebasedCorpus.py | 8 ++++---- tools/hsbench/scripts/pcapCorpus.py | 12 ++++++------ 8 files changed, 34 insertions(+), 35 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 994506608..6fc75eb3a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,8 +71,7 @@ include_directories(SYSTEM include) include (${CMAKE_MODULE_PATH}/boost.cmake) -# -- make this work? set(python_ADDITIONAL_VERSIONS 2.7 2.6) -find_package (Python COMPONENTS Interpreter Development) +find_package(Python COMPONENTS Interpreter) find_program(RAGEL ragel) if(NOT Python_Interpreter_FOUND) diff --git a/cmake/formatdate.py b/cmake/formatdate.py index 1b9c62d2b..b9845687b 100755 --- a/cmake/formatdate.py +++ b/cmake/formatdate.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import print_function + import os import sys import datetime diff --git a/tools/fuzz/aristocrats.py b/tools/fuzz/aristocrats.py index 7b6ff2bf3..96169582a 100755 --- a/tools/fuzz/aristocrats.py +++ b/tools/fuzz/aristocrats.py @@ -33,13 +33,13 @@ def generateRandomOptions(): parser.error("incorrect number of arguments") if (options.full): - crange = range(0,256) + crange = list(range(0,256)) crange.remove(ord('\n')) else: - crange = range(32, 127) + crange = list(range(32, 127)) -for i in xrange(0, options.count): +for i in range(0, options.count): len = randint(1, options.depth) - s = [ chr(choice(crange)) for x in xrange(len) ] + s = [ chr(choice(crange)) for x in range(len) ] line = str(i) + ":/" + "".join(s) + "/" + generateRandomOptions() - print line + print(line) diff --git a/tools/fuzz/completocrats.py b/tools/fuzz/completocrats.py index 60ac4d7ef..63ef0b91e 100755 --- a/tools/fuzz/completocrats.py +++ b/tools/fuzz/completocrats.py @@ -23,17 +23,17 @@ parser.error("incorrect number of arguments") if (options.full): - crange = range(0,256) + crange = list(range(0,256)) crange.remove(ord('\n')) elif (options.limited): crange = [ ord(c) for c in LIMITED_ALPHABET ] else: - crange = range(32, 127) + crange = list(range(32, 127)) srange = [ chr(c) for c in crange ] i = 0 for x in product(srange, repeat = options.depth): line = str(i) + ":/" + "".join(x) + "/" - print line + print(line) i += 1 diff --git a/tools/fuzz/heuristocrats.py b/tools/fuzz/heuristocrats.py index 49c7acb43..abd6f8ae9 100755 --- a/tools/fuzz/heuristocrats.py +++ b/tools/fuzz/heuristocrats.py @@ -9,7 +9,7 @@ def chooseLeafWidth(nChildren): width = randint(1, 5) width = min(width, nChildren-1) - s = sample(range(1, nChildren), width) + s = sample(list(range(1, nChildren)), width) s.sort() s = [0] + s + [nChildren] v = [ s[i+1] - s[i] for i in range(0, len(s)-1) if s[i+1] != s[i] ] @@ -73,7 +73,7 @@ def generateCharClass(nChildren, atTop = False): else: nChars = randint(2,4) - for i in xrange(nChars): + for i in range(nChars): s += generateChar(1) return "[" + s + "]" @@ -247,13 +247,13 @@ def generateRandomExtParam(depth, extparam): if len(args) != 0: parser.error("incorrect number of arguments") -alphabet = range(ord('a'), ord('a') + options.alphabet) +alphabet = list(range(ord('a'), ord('a') + options.alphabet)) if options.nocase: - alphabet += range(ord('A'), ord('A') + options.alphabet) + alphabet += list(range(ord('A'), ord('A') + options.alphabet)) -for i in xrange(0, options.count): - print "%08d:/%s/%s%s" % (i, generateRE(randint(1, options.depth), atTop = True), generateRandomOptions(), generateRandomExtParam(options.depth, options.extparam)) +for i in range(0, options.count): + print("%08d:/%s/%s%s" % (i, generateRE(randint(1, options.depth), atTop = True), generateRandomOptions(), generateRandomExtParam(options.depth, options.extparam))) if options.logical: - for i in xrange(options.count, options.count + 3000): - print "%08d:/%s/C" % (i, generateCombination(randint(1, options.depth), atTop = True)) + for i in range(options.count, options.count + 3000): + print("%08d:/%s/C" % (i, generateCombination(randint(1, options.depth), atTop = True))) diff --git a/tools/hsbench/scripts/gutenbergCorpus.py b/tools/hsbench/scripts/gutenbergCorpus.py index 62752a4d2..71a6d32d6 100755 --- a/tools/hsbench/scripts/gutenbergCorpus.py +++ b/tools/hsbench/scripts/gutenbergCorpus.py @@ -16,7 +16,7 @@ def addBlocks(builder, block_size, stream_size, text_id, text): global stream_id global stream_bytes - print "text", text_id, "len", len(text) + print("text", text_id, "len", len(text)) i = 0 while i < len(text): chunk = text[i:min(len(text), i + block_size)] @@ -26,11 +26,11 @@ def addBlocks(builder, block_size, stream_size, text_id, text): if stream_bytes >= stream_size: stream_id += 1 stream_bytes = 0 - print "Text", text_id, ": added", i/block_size, "blocks of", block_size, "bytes." + print("Text", text_id, ": added", i/block_size, "blocks of", block_size, "bytes.") def buildCorpus(outFN, block_size, stream_size, text_ids): if len(text_ids) == 0: - print >>sys.stderr, "Must provide at least one input ID" + print("Must provide at least one input ID", file=sys.stderr) sys.exit(0) builder = CorpusBuilder(outFN) @@ -48,12 +48,12 @@ def buildCorpus(outFN, block_size, stream_size, text_ids): builder.finish() - print "Total:", total_bytes, "bytes." + print("Total:", total_bytes, "bytes.") def usage(exeName): errmsg = "Usage: %s -o -b -s ..." errmsg = errmsg % exeName - print >> sys.stderr, errmsg + print(errmsg, file=sys.stderr) sys.exit(-1) if __name__ == '__main__': @@ -62,7 +62,7 @@ def usage(exeName): requiredKeys = [ '-o', '-b', '-s' ] for k in requiredKeys: - if not opts.has_key(k): + if k not in opts: usage(os.path.basename(sys.argv[0])) buildCorpus(opts['-o'], int(opts['-b']), int(opts['-s']), args) diff --git a/tools/hsbench/scripts/linebasedCorpus.py b/tools/hsbench/scripts/linebasedCorpus.py index b27f8674f..7af07d28c 100755 --- a/tools/hsbench/scripts/linebasedCorpus.py +++ b/tools/hsbench/scripts/linebasedCorpus.py @@ -15,13 +15,13 @@ def lineCorpus(inFN, outFN): ''' if not os.path.exists(inFN): - print >> sys.stderr, "Input file '%s' does not exist. Exiting." % outFN + print("Input file '%s' does not exist. Exiting." % outFN, file=sys.stderr) sys.exit(-1) lines = open(inFN).readlines() if len(lines) == 0: - print >> sys.stderr, "Input file contained no lines. Exiting." + print("Input file contained no lines. Exiting.", file=sys.stderr) sys.exit(0) builder = CorpusBuilder(outFN) @@ -37,7 +37,7 @@ def lineCorpus(inFN, outFN): def usage(exeName): errmsg = "Usage: %s -i -o " errmsg = errmsg % exeName - print >> sys.stderr, errmsg + print(errmsg, file=sys.stderr) sys.exit(-1) if __name__ == '__main__': @@ -46,7 +46,7 @@ def usage(exeName): requiredKeys = [ '-i', '-o' ] for k in requiredKeys: - if not args.has_key(k): + if k not in args: usage(os.path.basename(sys.argv[0])) fnArgs = tuple([args[k] for k in requiredKeys]) diff --git a/tools/hsbench/scripts/pcapCorpus.py b/tools/hsbench/scripts/pcapCorpus.py index 30d6192c6..3efba805d 100755 --- a/tools/hsbench/scripts/pcapCorpus.py +++ b/tools/hsbench/scripts/pcapCorpus.py @@ -35,7 +35,7 @@ def usage(exeName) : errmsg = "Usage: %s -i -o " errmsg = errmsg % exeName - print >> sys.stderr, errmsg + print(errmsg, file=sys.stderr) sys.exit(-1) class FiveTuple(object): @@ -208,7 +208,7 @@ def enchunk_pcap(pcapFN, sqliteFN): """ if not os.path.exists(pcapFN): - print >> sys.stderr, "Input file '%s' does not exist. Exiting." % pcapFN + print("Input file '%s' does not exist. Exiting." % pcapFN, file=sys.stderr) sys.exit(-1) builder = CorpusBuilder(sqliteFN) @@ -225,7 +225,7 @@ def enchunk_pcap(pcapFN, sqliteFN): while not done: try: - ts, packet = pcap_ref.next() + ts, packet = next(pcap_ref) except: break @@ -285,10 +285,10 @@ def enchunk_pcap(pcapFN, sqliteFN): # Having read the contents of the pcap, we fill the database with any # remaining TCP and UDP segments # - for tcp_stream in tcp_streams.itervalues(): + for tcp_stream in tcp_streams.values(): db_add_tcp_stream_segments(builder, tcp_stream) - for udp_stream in udp_streams.itervalues(): + for udp_stream in udp_streams.values(): db_add_udp_stream_segments(builder, udp_stream) # @@ -303,7 +303,7 @@ def enchunk_pcap(pcapFN, sqliteFN): requiredKeys = [ '-i', '-o'] for k in requiredKeys : - if not args.has_key(k) : + if k not in args : usage(os.path.basename(sys.argv[0])) fnArgs = tuple([ args[k] for k in requiredKeys ])