Merge lp:~dobey/ubuntuone-installer/unicode-gettext into lp:ubuntuone-installer

[dobey]

Use gettext.install so gettext will return unicode objects instead of bytes

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntuone-installer/unicode-gettext into lp:ubuntuone-installer failed. Below is the output from the failed tests.

ubuntuone.devtools.testcases
  BaseTestCase
    runTest ... [OK]
ubuntuone.installer.tests.test_installer
  InstallerTestCase
    test_is_installed_false ... [OK]
    test_is_installed_systemerror_false ... [OK]
    test_is_installed_systemerror_true ... [OK]
    test_is_installed_true ... [OK]
ubuntuone.devtools.testcases.dbus
  DBusTestCase
    runTest ... [OK]
ubuntuone.installer.tests.test_gui
  GUITestCase
    test_initial_page ... [OK]
    test_page_switched ... Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/defer/__init__.py", line 475, in _inline_callbacks
    result = gen.send(result)
  File "/usr/lib/python2.7/dist-packages/aptdaemon/client.py", line 1613, in _run_transaction_helper
    daemon = get_aptdaemon(self.bus)
  File "/usr/lib/python2.7/dist-packages/aptdaemon/client.py", line 1687, in get_aptdaemon
    False),
  File "/usr/lib/python2.7/dist-packages/dbus/bus.py", line 241, in get_object
    follow_name_owner_changes=follow_name_owner_changes)
  File "/usr/lib/python2.7/dist-packages/dbus/proxies.py", line 248, in __init__
    self._named_service = conn.activate_name_owner(bus_name)
  File "/usr/lib/python2.7/dist-packages/dbus/bus.py", line 180, in activate_name_owner
    self.start_service_by_name(bus_name)
  File "/usr/lib/python2.7/dist-packages/dbus/bus.py", line 278, in start_service_by_name
    'su', (bus_name, flags)))
  File "/usr/lib/python2.7/dist-packages/dbus/connection.py", line 651, in call_blocking
    message, timeout)
dbus.exceptions.DBusException: org.freedesktop.DBus.Error.ServiceUnknown: The name org.debian.apt was not provided by any .service files
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/defer/__init__.py", line 475, in _inline_callbacks
    result = gen.send(result)
  File "/usr/lib/python2.7/dist-packages/aptdaemon/client.py", line 1613, in _run_transaction_helper
    daemon = get_aptdaemon(self.bus)
  File "/usr/lib/python2.7/dist-packages/aptdaemon/client.py", line 1687, in get_aptdaemon
    False),
  File "/usr/lib/python2.7/dist-packages/dbus/bus.py", line 241, in get_object
    follow_name_owner_changes=follow_name_owner_changes)
  File "/usr/lib/python2.7/dist-packages/dbus/proxies.py", line 248, in __init__
    self._named_service = conn.activate_name_owner(bus_name)
  File "/usr/lib/python2.7/dist-packages/dbus/bus.py", line 180, in activate_name_owner
    self.start_service_by_name(bus_name)
  File "/usr/lib/python2.7/dist-packages/dbus/bus.py", line 278, in start_service_by_name
    'su', (bus_name, flags)))
  File "/usr/lib/python2.7/dist-packages/dbus/connection.py", line 651, in call_blocking
    message, timeout)
dbus.exceptions.DBusException: org.freedesktop.DBus.Er...

[lp:~dobey/ubuntuone-installer/unicode-gettext]

24. By dobey on 2012-02-23

Add a define of _ if it's not already defined, to fix lint warnings

=== modified file 'ubuntuone/installer/gui.py'
--- ubuntuone/installer/gui.py	2012-02-22 16:36:54 +0000
+++ ubuntuone/installer/gui.py	2012-02-23 14:46:18 +0000
@@ -35,8 +35,9 @@
 if inline_callbacks is None:
     inline_callbacks = old_callbacks
 
-gettext.textdomain('ubuntuone-installer')
-_ = gettext.gettext
+gettext.install(domain='ubuntuone-installer', unicode=True)
+if '_' not in __builtins__:
+    _ = gettext.gettext
 
 
 class UnsupportedDistribution(BaseException):