Changeset 44

Timestamp:

05/03/05 18:11:39 (3 years ago)

Author:

steve

Message:

integrated unicode support patch #3 from Andreas Klöckner

Files:

• trunk/airspeed.py (modified) (3 diffs)
• trunk/airspeed_test.py (modified) (2 diffs)

trunk/airspeed.py

@@ -3 +3 @@
-import re, operator, os
-
-
-
+
-
-__all__ = ['Template', 'TemplateError', 'TemplateSyntaxError', 'CachingFileLoader']
@@ -28 +27 @@
-    operator.__eq__ = lambda a, b: a == b
-    operator.__ne__ = lambda a, b: a != b
+try:
+    basestring
+    def is_string(s): return isinstance(s, basestring)
+except NameError:
+    def is_string(s): return type(s) == type('')
-
-###############################################################################
@@ -406 +410 @@
-            if self.silent: value = ''
-            else: value = self.my_text()
-
+
+
+
+
-
-

trunk/airspeed_test.py

@@ -1 +1 @@
-#!/usr/bin/env python
+# -*- coding: latin1 -*-
-
-from unittest import TestCase, main
@@ -439 +440 @@
-        value = template.merge({'obj': C(), 'param':'bat'})
-        self.assertEquals('monkey', value)
+
+    def test_preserves_unicode_strings(self):
+        template = airspeed.Template('$value')
+        value = unicode('Grüße', 'latin1')
+        self.assertEquals(value, template.merge(locals()))
+
-
-#