Ported ipaaca-iu-injector and ipaaca-iu-sniffer scripts to Python3

ipaacatools/scripts/ipaaca-iu-injector

@@ -31,7 +31,7 @@
 # Forschungsgemeinschaft (DFG) in the context of the German
 # Excellence Initiative.
 
-from __future__ import division, print_function
+#from __future__ import division, print_function
 
 import itertools
 import os
@@ -44,7 +44,7 @@ import ipaaca
 
 def iu_update_handler(iu, event_type, local):
 	try:
-		print(event_type + ': ' + unicode(iu))
+		print(event_type + ': ' + str(iu))
 	except:
 		print(u"An error occurred printing an IU for an event of type "+event_type)
 
@@ -93,9 +93,9 @@ if __name__ == '__main__':
 	iu = ipaaca.Message(arguments.category) if arguments.iu_type == 'Message' else ipaaca.IU(arguments.category)
 	if arguments.json_payload:
 		# Treat payload values as Python expressions
-		iu.payload = {k: eval(v) for (k, v) in itertools.izip_longest(arguments.payload[::2],	arguments.payload[1::2])}
+		iu.payload = {k: eval(v) for (k, v) in itertools.zip_longest(arguments.payload[::2],	arguments.payload[1::2])}
 	else:
-		iu.payload = {k: v for (k, v) in itertools.izip_longest(arguments.payload[::2],	arguments.payload[1::2])}
+		iu.payload = {k: v for (k, v) in itertools.zip_longest(arguments.payload[::2],	arguments.payload[1::2])}
 	ob.add(iu)
 
 	print(
@@ -114,7 +114,7 @@ if __name__ == '__main__':
 			time.sleep(0.1)
 	except KeyboardInterrupt:
 		pass
-	except Exception, e:
-		print(u'Exception: '+unicode(traceback.format_exc()))
+	except Exception as e:
+		print(u'Exception: '+str(traceback.format_exc()))
 		ipaaca.exit(1)
 	ipaaca.exit(0)

ipaacatools/scripts/ipaaca-iu-sniffer

@@ -31,7 +31,7 @@
 # Forschungsgemeinschaft (DFG) in the context of the German
 # Excellence Initiative.
 
-from __future__ import division, print_function
+#from __future__ import division, print_function
 
 import logging
 import os
@@ -61,13 +61,13 @@ def highlight_if_color(s, c='1'):
 def pretty_printed_dict(d):
 	s='{\n'
 	for k, v in d.items():
-		if isinstance(v, unicode) or isinstance(v, str):
-			v = "'"+unicode(v)+"'"
+		if isinstance(v, str) or isinstance(v, str):
+			v = "'"+str(v)+"'"
 		else:
-			v = unicode(v)
+			v = str(v)
 		v2 = v if len(v) <= arguments.max_size else v[:arguments.max_size] + '<excess length omitted>'
 		v2.replace('\\','\\\\').replace('\n', highlight_if_color('\\n'))
-		s += "\t '%s': %s,\n" % (highlight_if_color(unicode(k),'1'), unicode(v2))
+		s += "\t '%s': %s,\n" % (highlight_if_color(str(k),'1'), str(v2))
 	s+='}'
 	return s
 
@@ -200,7 +200,7 @@ if __name__ == '__main__':
 			time.sleep(1)
 	except KeyboardInterrupt:
 		pass
-	except Exception, e:
-		print(u'Exception: '+unicode(traceback.format_exc()))
+	except Exception as e:
+		print(u'Exception: '+str(traceback.format_exc()))
 		ipaaca.exit(1)
 	ipaaca.exit(0)