From 452770331217f46f37d2de976fb5d8b0b24fb831 Mon Sep 17 00:00:00 2001
From: Dirk Thomas <dthomas@osrfoundation.org>
Date: Wed, 23 Oct 2013 16:38:19 -0700
Subject: [PATCH] python 3 compatibility

---
 src/genmsg/gentools.py         | 3 ++-
 src/genmsg/template_tools.py   | 4 ++--
 test/test_genmsg_gentools.py   | 6 +++---
 test/test_genmsg_msg_loader.py | 2 +-
 test/test_genmsg_msgs.py       | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/genmsg/gentools.py b/src/genmsg/gentools.py
index 8d611cf..bd6bc20 100644
--- a/src/genmsg/gentools.py
+++ b/src/genmsg/gentools.py
@@ -87,7 +87,8 @@ def compute_md5_text(msg_context, spec):
             sub_md5 = compute_md5(msg_context, sub_spec)
             buff.write("%s %s\n"%(sub_md5, name))
     
-    return buff.getvalue().strip() # remove trailing new line
+    value = buff.getvalue().strip() # remove trailing new line
+    return value.encode()
 
 def _compute_hash(msg_context, spec, hash):
     """
diff --git a/src/genmsg/template_tools.py b/src/genmsg/template_tools.py
index 949950f..6ac9323 100644
--- a/src/genmsg/template_tools.py
+++ b/src/genmsg/template_tools.py
@@ -71,7 +71,7 @@ def _generate_from_spec(input_file, output_dir, template_dir, msg_context, spec,
         if not os.path.isfile(template_file):
             ofile.close()
             os.remove(output_file)
-            raise RuntimeError, "Template file %s not found in template dir %s" % (template_file_name, template_dir)
+            raise RuntimeError("Template file %s not found in template dir %s" % (template_file_name, template_dir))
         interpreter.file(open(template_file)) #todo try
         interpreter.shutdown()
 
@@ -171,7 +171,7 @@ def generate_module(package_name, output_dir, template_dir, template_dict):
         if not os.path.isfile(template_file):
             ofile.close()
             os.remove(output_file)
-            raise RuntimeError, "Template file %s not found in template dir %s" % (template_file_name, template_dir)
+            raise RuntimeError("Template file %s not found in template dir %s" % (template_file_name, template_dir))
         interpreter.file(open(template_file)) #todo try
         interpreter.shutdown()
 
diff --git a/test/test_genmsg_gentools.py b/test/test_genmsg_gentools.py
index 5a921d1..8797d82 100644
--- a/test/test_genmsg_gentools.py
+++ b/test/test_genmsg_gentools.py
@@ -105,7 +105,7 @@ def test_compute_md5_text():
 
     tests = _load_md5_tests('md5text')
     # text file #1 is the reference
-    for k, files in tests.iteritems():
+    for k, files in tests.items():
         print("running tests", k)
         ref_file = [f for f in files if f.endswith('%s1.txt'%k)]
         if not ref_file:
@@ -124,7 +124,7 @@ def test_md5_equals():
 
     search_path = get_search_path()
     tests = _load_md5_tests('same')
-    for k, files in tests.iteritems():
+    for k, files in tests.items():
         print("running tests", k)
         md5sum = _compute_md5(msg_context, files[0])
         for f in files[1:]:
@@ -135,7 +135,7 @@ def test_md5_not_equals():
     msg_context = MsgContext.create_default()
 
     tests = _load_md5_tests('different')
-    for k, files in tests.iteritems():
+    for k, files in tests.items():
         print("running tests", k)
         md5s = set()
         md6md5sum = _compute_md5(msg_context, files[0])
diff --git a/test/test_genmsg_msg_loader.py b/test/test_genmsg_msg_loader.py
index 83610a1..74dc782 100644
--- a/test/test_genmsg_msg_loader.py
+++ b/test/test_genmsg_msg_loader.py
@@ -158,7 +158,7 @@ def test_load_msg_from_string():
     from genmsg.msg_loader import load_msg_from_string, MsgContext
     context = MsgContext.create_default()
     msgspec = load_msg_from_string(context, "Header header", 'test_pkg/HeaderTest')
-    print msgspec
+    print(msgspec)
     assert msgspec.has_header()
     assert msgspec.types == ['std_msgs/Header']
     assert msgspec.names == ['header']
diff --git a/test/test_genmsg_msgs.py b/test/test_genmsg_msgs.py
index 2de2a64..dc09b2b 100644
--- a/test/test_genmsg_msgs.py
+++ b/test/test_genmsg_msgs.py
@@ -89,7 +89,7 @@ def test_parse_type():
 
 def test_Constant():
     import genmsg.msgs    
-    vals = [random.randint(0, 1000) for i in xrange(0, 3)]
+    vals = [random.randint(0, 1000) for i in range(0, 3)]
     type_, name, val = [str(x) for x in vals]
     x = genmsg.msgs.Constant(type_, name, val, str(val))
     assert type_ == x.type