fixing tests for new check to decide if encoding is necessary during …

…serialization.
ros · Aug 11, 2017 · 047039c · 047039c
1 parent 6869948
commit 047039c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/test/files/array/string_varlen_ser.txt b/test/files/array/string_varlen_ser.txt
@@ -2,7 +2,7 @@ length = len(data)
 buff.write(_struct_I.pack(length))
 for val0 in data:
   length = len(val0)
-  if python3 or type(val0) == unicode:
+  if isinstance(val0, str if python3 else unicode):
     val0 = val0.encode('utf-8')
     length = len(val0)
   buff.write(struct.pack('<I%ss'%length, length, val0))
diff --git a/test/test_genpy_generator.py b/test/test_genpy_generator.py
@@ -293,7 +293,7 @@ def test_string_serializer_generator():
     g = genpy.generator.string_serializer_generator('foo', 'string', 'var_name', True)
     val = '\n'.join(g)
     assert """length = len(var_name)
-if python3 or type(var_name) == unicode:
+if isinstance(var_name, str if python3 else unicode):
   var_name = var_name.encode('utf-8')
   length = len(var_name)
 buff.write(struct.pack('<I%ss'%length, length, var_name))""" == val, val