Merge pull request #683 from grycap/devel

Fix #682
grycap · Oct 2, 2018 · 5f7161a · 5f7161a
2 parents 4ac8d19 + 552456b
commit 5f7161a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/IM/REST.py b/IM/REST.py
@@ -284,7 +284,7 @@ def format_output(res, default_type="text/plain", field_name=None, list_field_na
                     if isinstance(res, list):
                         info = "\n".join(res)
                     else:
-                        info = str(res)
+                        info = "%s" % res
                 content_type = default_type
                 break
 
@@ -299,7 +299,7 @@ def format_output(res, default_type="text/plain", field_name=None, list_field_na
             if isinstance(res, list):
                 info = "\n".join(res)
             else:
-                info = str(res)
+                info = "%s" % res
         bottle.response.content_type = default_type
 
     return info

diff --git a/test/unit/REST.py b/test/unit/REST.py
@@ -778,6 +778,9 @@ def test_format_output(self, get_media_type):
         info = format_output(["1", "2"])
         self.assertEqual(info, '1\n2')
 
+        info = format_output(u'contmsg\xe1', field_name="contmsg", default_type="text/plain")
+        self.assertEqual(info, u'contmsg\xe1')
+
         get_media_type.return_value = ["application/zip"]
         info = format_output(["1", "2"])
         self.assertEqual(info, 'Unsupported Accept Media Types: application/zip')