Merge lp:~vorlon/aptdaemon/lp.1034806 into lp:aptdaemon

[Steve Langasek]

Fixes for str/unicode confusion in aptdaemon. These don't matter much in
practice for python3, but I think python2 compatibility is still a goal for
aptdaemon upstream.

=== modified file 'aptdaemon/core.py'
--- aptdaemon/core.py	2012-06-06 13:53:40 +0000
+++ aptdaemon/core.py	2012-08-11 02:38:19 +0000
@@ -68,6 +68,12 @@
 
 # Setup i18n
 _ = lambda msg: gettext.dgettext("aptdaemon", msg)
+if sys.version >= '3':
+    _gettext_method = "gettext"
+    _ngettext_method = "ngettext"
+else:
+    _gettext_method = "ugettext"
+    _ngettext_method = "ungettext"
 
 APTDAEMON_DBUS_INTERFACE = 'org.debian.apt'
 APTDAEMON_DBUS_PATH = '/org/debian/apt'
@@ -1220,6 +1226,16 @@
         """Set the kwargs which will be send to the AptWorker."""
         self.kwargs = kwargs
 
+    def _get_translations(self):
+        """Get a usable translations object, no matter what."""
+        if self._translation:
+            return self._translation
+        else:
+            domain = "aptdaemon"
+            return gettext.translation(domain, gettext.bindtextdomain(domain),
+                                       gettext.bind_textdomain_codeset(domain),
+                                       fallback=True)
+
     def gettext(self, msg):
         """Translate the given message to the language of the transaction.
         Fallback to the system default.
@@ -1227,19 +1243,15 @@
         # Avoid showing the header of the mo file for an empty string
         if not msg:
             return ""
-        if self._translation:
-            return self._translation.gettext(msg)
-        else:
-            return gettext.gettext(msg)
+        translation = self._get_translations()
+        return getattr(translation, _gettext_method)(msg)
 
     def ngettext(self, singular, plural, count):
         """Translate the given plural message to the language of the
         transaction. Fallback to the system default.
         """
-        if self._translation:
-            return self._translation.ngettext(singular, plural, count)
-        else:
-            return gettext.ngettext(singular, plural, count)
+        translation = self._get_translations()
+        return getattr(translation, _ngettext_method)(singular, plural, count)
 
 
 class TransactionQueue(GObject.GObject):

=== modified file 'aptdaemon/utils.py'
--- aptdaemon/utils.py	2012-05-09 00:49:57 +0000
+++ aptdaemon/utils.py	2012-08-11 02:38:19 +0000
@@ -24,11 +24,17 @@
 
 __all__ = ("deprecated", "IsoCodes")
 
+import sys
 import gettext
 import functools
 import warnings
 from xml.etree import ElementTree
 
+if sys.version >= '3':
+    _gettext_method = "gettext"
+else:
+    _gettext_method = "ugettext"
+
 def deprecated(func):
     """This is a decorator which can be used to mark functions
     as deprecated. It will result in a warning being emitted
@@ -76,7 +82,7 @@
             return None
         trans = gettext.translation(domain=self.norm, fallback=True,
                                     languages=[locale])
-        return trans.gettext(name)
+        return getattr(trans,_gettext_method)(name)
 
     def get_name(self, value):
         try:

=== added file 'tests/regressions/test_lp768691.py'
--- tests/regressions/test_lp768691.py	1970-01-01 00:00:00 +0000
+++ tests/regressions/test_lp768691.py	2012-08-11 02:38:19 +0000
@@ -0,0 +1,65 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""Tests if we can handle different encodings well."""
+
+import locale
+import logging
+import os
+import sys
+import unittest
+
+from aptdaemon import core, enums, test, errors, utils
+
+DEBUG=True
+
+if sys.version >= '3':
+	unicode = str
+
+class GettextTest(test.AptDaemonTestCase):
+
+    """Regression test for LP: #768691 and LP: #926340
+
+    The gettext.translation.gettext() method returns a string in Python 2.
+    If we try to perform a string format operation, Python wants to convert
+    string to unicode. If the daemon is running with a different
+    default encoding as the translated message this results in an error.
+    By defaulf aptdaemon runs as C if activated by D-Bus.
+    """
+
+    def setUp(self):
+        # Use the mo files from the build
+        local_mo_files = os.path.join(test.get_tests_dir(),
+                                      "../build/mo")
+        if not os.path.isdir(local_mo_files):
+            self.skipTest("Please run setup.py build before since local mo "
+                          "files are required. Run python setup.py build_i18n")
+        core.gettext._default_localedir = local_mo_files
+
+        self.trans = core.Transaction(None, enums.ROLE_FIX_BROKEN_DEPENDS,
+                                      None, os.getpid(), os.getuid(),
+                                      sys.argv[0], "org.debian.apt.test",
+                                      connect=False)
+        self.codes = utils.IsoCodes("iso_639", tag="iso_639_1_code",
+                                  fallback_tag="iso_639_2T_code")
+
+    def test(self):
+        """Test if the installation of an unauthenticated packages fails
+        if simulate hasn't been called explicitly before.
+        """
+        self.trans._set_locale("de_DE.UTF-8")
+        ret = self.trans.gettext("CD/DVD '%s' is required")
+        self.assertTrue(isinstance(ret, unicode))
+        error = errors.TransactionFailed(enums.ERROR_NO_PACKAGE,
+                                         "CD/DVD '%s' is required", "lala")
+        self.trans.error = error
+
+        utils.gettext._default_localedir = "/usr/share/locale"
+        lang = self.codes.get_localised_name("en", "ru.UTF-8")
+        self.assertTrue(isinstance(lang, unicode))
+
+if __name__ == "__main__":
+    if DEBUG:
+        logging.basicConfig(level=logging.DEBUG)
+    unittest.main()
+
+# vim: ts=4 et sts=4