Bump scripts to python3

This commit is contained in:
Jan Henning
2022-05-19 16:25:08 +02:00
parent 0a35a467e0
commit 85a77e3eff
8 changed files with 34 additions and 35 deletions

View File

@@ -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 <output file> -b <block size> -s <max stream size> <gutenberg text id>..."
errmsg = errmsg % exeName
print >> sys.stderr, errmsg
print(errmsg, file=sys.stderr)
sys.exit(-1)
if __name__ == '__main__':
@@ -62,7 +62,7 @@ if __name__ == '__main__':
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)

View File

@@ -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 <input file> -o <output file>"
errmsg = errmsg % exeName
print >> sys.stderr, errmsg
print(errmsg, file=sys.stderr)
sys.exit(-1)
if __name__ == '__main__':
@@ -46,7 +46,7 @@ if __name__ == '__main__':
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])

View File

@@ -35,7 +35,7 @@ cur_stream_id = 0
def usage(exeName) :
errmsg = "Usage: %s -i <pcap-file> -o <sqlite-file>"
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 @@ if __name__ == '__main__' :
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 ])