fix issue with objects as values and some unicode characters

purcell · Nov 11, 2013 · ea0d205 · ea0d205
1 parent 5d1b59c
commit ea0d205
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/airspeed/__init__.py b/airspeed/__init__.py
@@ -553,7 +553,7 @@ def evaluate(self, stream, namespace, loader):
         if is_string(value):
             stream.write(value)
         else:
-            stream.write(str(value))
+            stream.write(unicode(value))
 
 
 class Null:

diff --git a/tests/airspeed_test.py b/tests/airspeed_test.py
@@ -685,6 +685,16 @@ def test_preserves_unicode_strings(self):
         value = unicode('Grüße', 'latin1')
         self.assertEquals(value, template.merge(locals()))
 
+    def test_preserves_unicode_strings_objects(self):
+        template = airspeed.Template('$value')
+        class Clazz:
+            def __init__(self, value):
+                self.value = value
+            def __str__(self):
+                return self.value
+        value = Clazz(u'£12,000')
+        self.assertEquals(unicode(value), template.merge(locals()))
+
     def test_can_define_macros_in_parsed_files(self):
         class Loader:
             def load_template(self, name):