#2512 implement the 3.0 gettext API

All the u* gettext variants were renamed to their
none u* variants, since there's no point in translating
to byte strings. I also killed off the unicode parameters
for install

1 files changed, 5 insertions, 5 deletions

diff --git a/Lib/test/test_gettext.py b/Lib/test/test_gettext.py
index 73c9c1c..6ee608e 100644
--- a/Lib/test/test_gettext.py
+++ b/Lib/test/test_gettext.py
@@ -143,13 +143,13 @@ trggrkg zrffntr pngnybt yvoenel.''')
         t.install()
         eq(_('nudge nudge'), 'wink wink')
         # Try unicode return type
-        t.install(str=True)
+        t.install()
         eq(_('mullusk'), 'bacon')
         # Test installation of other methods
         import builtins
-        t.install(str=True, names=["gettext", "lgettext"])
-        eq(_, t.ugettext)
-        eq(builtins.gettext, t.ugettext)
+        t.install(names=["gettext", "lgettext"])
+        eq(_, t.gettext)
+        eq(builtins.gettext, t.gettext)
         eq(lgettext, t.lgettext)
         del builtins.gettext
         del builtins.lgettext
@@ -305,7 +305,7 @@ class UnicodeTranslationsTest(GettextBaseTest):
             self.t = gettext.GNUTranslations(fp)
         finally:
             fp.close()
-        self._ = self.t.ugettext
+        self._ = self.t.gettext
 
     def test_unicode_msgid(self):
         unless = self.failUnless