Revert changes not related to empy

Signed-off-by: Jose Luis Rivero <jrivero@honurobotics.com>

Author: j-rivero

bloom/generators/debian/generator.py

@@ -104,6 +104,23 @@
     debug(traceback.format_exc())
     error("rosdistro was not detected, please install it.", exit=True)
 
+try:
+    import em
+except ImportError:
+    debug(traceback.format_exc())
+    error("empy was not detected, please install it.", exit=True)
+
+# Fix unicode bug in empy
+# This should be removed once upstream empy is fixed
+# See: https://github.com/ros-infrastructure/bloom/issues/196
+try:
+    em.str = unicode
+    em.Stream.write_old = em.Stream.write
+    em.Stream.write = lambda self, data: em.Stream.write_old(self, data.encode('utf8'))
+except NameError:
+    pass
+# End fix
+
 # Drop the first log prefix for this command
 enable_drop_first_log_prefix(True)
 
@@ -136,7 +153,10 @@ def __place_template_folder(group, src, dst, gbp=False):
                 debug("Not overwriting existing file '{0}'".format(template_dst))
             else:
                 with io.open(template_dst, 'w', encoding='utf-8') as f:
-                    if isinstance(template, bytes):
+                    if not isinstance(template, str):
+                        template = template.decode('utf-8')
+                    # Python 2 API needs a `unicode` not a utf-8 string.
+                    elif sys.version_info.major == 2:
                         template = template.decode('utf-8')
                     f.write(template)
                 shutil.copystat(template_abs_path, template_dst)
@@ -465,11 +485,17 @@ def generate_substitutions_from_package(
     data['Licenses'] = licenses
 
     def convertToUnicode(obj):
-        if isinstance(obj, bytes):
-            return str(obj.decode('utf8'))
-        elif isinstance(obj, str):
-            return obj
-        elif isinstance(obj, list):
+        if sys.version_info.major == 2:
+            if isinstance(obj, str):
+                return unicode(obj.decode('utf8'))
+            elif isinstance(obj, unicode):
+                return obj
+        else:
+            if isinstance(obj, bytes):
+                return str(obj.decode('utf8'))
+            elif isinstance(obj, str):
+                return obj
+        if isinstance(obj, list):
             for i, val in enumerate(obj):
                 obj[i] = convertToUnicode(val)
             return obj
@@ -518,6 +544,8 @@ def __process_template_folder(path, subs):
             continue
         # Write the result
         with io.open(template_path, 'w', encoding='utf-8') as f:
+            if sys.version_info.major == 2:
+                result = result.decode('utf-8')
             f.write(result)
         # Copy the permissions
         shutil.copymode(item, template_path)

bloom/generators/rpm/generator.py

@@ -320,11 +320,17 @@ def generate_substitutions_from_package(
     summarize_dependency_mapping(data, depends, build_depends, resolved_deps)
 
     def convertToUnicode(obj):
-        if isinstance(obj, bytes):
-            return str(obj.decode('utf8'))
-        elif isinstance(obj, str):
-            return obj
-        elif isinstance(obj, list):
+        if sys.version_info.major == 2:
+            if isinstance(obj, str):
+                return unicode(obj.decode('utf8'))
+            elif isinstance(obj, unicode):
+                return obj
+        else:
+            if isinstance(obj, bytes):
+                return str(obj.decode('utf8'))
+            elif isinstance(obj, str):
+                return obj
+        if isinstance(obj, list):
             for i, val in enumerate(obj):
                 obj[i] = convertToUnicode(val)
             return obj
@@ -370,6 +376,8 @@ def __process_template_folder(path, subs):
         result = expand_template_em(template, subs)
         # Write the result
         with io.open(template_path, 'w', encoding='utf-8') as f:
+            if sys.version_info.major == 2:
+                result = result.decode('utf-8')
             f.write(result)
         # Copy the permissions
         shutil.copymode(item, template_path)