- first pass at running a py3k compatible base in py2k as well.

having some weird unicode issues I can't debug; the meaning of
str.encode() seems to be changing globally somehow

1 files changed, 20 insertions, 20 deletions

diff --git a/test/test_babelplugin.py b/test/test_babelplugin.py
index 8769da0..55be33f 100644
--- a/test/test_babelplugin.py
+++ b/test/test_babelplugin.py
@@ -19,26 +19,26 @@ class ExtractMakoTestCase(TemplateTest):
                                             'ungettext': (1, 2)},
                                 ['TRANSLATOR:'], {}))
         expected = \
-            [(1, '_', u'Page arg 1', []),
-             (1, '_', u'Page arg 2', []),
-             (10, 'gettext', u'Begin', []),
-             (14, '_', u'Hi there!', [u'TRANSLATOR: Hi there!']),
-             (19, '_', u'Hello', []),
-             (22, '_', u'Welcome', []),
-             (25, '_', u'Yo', []),
-             (36, '_', u'The', [u'TRANSLATOR: Ensure so and', u'so, thanks']),
-             (36, 'ungettext', (u'bunny', u'bunnies', None), []),
-             (41, '_', u'Goodbye', [u'TRANSLATOR: Good bye']),
-             (44, '_', u'Babel', []),
-             (45, 'ungettext', (u'hella', u'hellas', None), []),
-            (62, '_', u'The', [u'TRANSLATOR: Ensure so and', u'so, thanks']),
-            (62, 'ungettext', (u'bunny', u'bunnies', None), []),
-            (68, '_', u'Goodbye, really!', [u'TRANSLATOR: HTML comment']),
-            (71, '_', u'P.S. byebye', []),
-            (77, '_', u'Top', []),
-            (83, '_', u'foo', []),
-            (83, '_', u'baz', []),
-            (85, '_', u'bar', [])
+            [(1, '_', 'Page arg 1', []),
+             (1, '_', 'Page arg 2', []),
+             (10, 'gettext', 'Begin', []),
+             (14, '_', 'Hi there!', ['TRANSLATOR: Hi there!']),
+             (19, '_', 'Hello', []),
+             (22, '_', 'Welcome', []),
+             (25, '_', 'Yo', []),
+             (36, '_', 'The', ['TRANSLATOR: Ensure so and', 'so, thanks']),
+             (36, 'ungettext', ('bunny', 'bunnies', None), []),
+             (41, '_', 'Goodbye', ['TRANSLATOR: Good bye']),
+             (44, '_', 'Babel', []),
+             (45, 'ungettext', ('hella', 'hellas', None), []),
+            (62, '_', 'The', ['TRANSLATOR: Ensure so and', 'so, thanks']),
+            (62, 'ungettext', ('bunny', 'bunnies', None), []),
+            (68, '_', 'Goodbye, really!', ['TRANSLATOR: HTML comment']),
+            (71, '_', 'P.S. byebye', []),
+            (77, '_', 'Top', []),
+            (83, '_', 'foo', []),
+            (83, '_', 'baz', []),
+            (85, '_', 'bar', [])
              ]
         self.assertEqual(expected, messages)