Merge lp:~cjwatson/ubiquity/indicator-keymaps-960047 into lp:ubiquity

[Colin Watson]

Fix misc.set_indicator_keymaps to handle ll_CC forms of lang, and also to avoid crashing on unknown languages in general (LP: #960047).

[lp:~cjwatson/ubiquity/indicator-keymaps-960047]

5281. By Colin Watson on 2012-03-20

call engine.lock_group(0) in all cases, per stgraber

[Stéphane Graber (stgraber)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-19 22:03:15 +0000
+++ debian/changelog	2012-03-20 13:43:22 +0000
@@ -1,3 +1,10 @@
+ubiquity (2.9.31) UNRELEASED; urgency=low
+
+  * Fix misc.set_indicator_keymaps to handle ll_CC forms of lang, and also
+    to avoid crashing on unknown languages in general (LP: #960047).
+
+ -- Colin Watson <[e-mail]>  Tue, 20 Mar 2012 13:28:02 +0000
+
 ubiquity (2.9.30) precise; urgency=low
 
   [ Adam Conrad ]

=== modified file 'tests/test_misc.py'
--- tests/test_misc.py	2012-03-19 20:24:05 +0000
+++ tests/test_misc.py	2012-03-20 13:43:22 +0000
@@ -183,6 +183,27 @@
         self.assertEqual(mock_set_list.call_args[0][1], 'layouts')
         self.assertIn('se\tdvorak', mock_set_list.call_args[0][2])
 
+    @mock.patch('ubiquity.gsettings.set_list')
+    @mock.patch('ubiquity.misc.execute')
+    def test_set_indicator_keymaps_simplified_chinese(self, mock_execute,
+                                                      mock_set_list):
+        misc.set_indicator_keymaps('zh_CN')
+        self.assertEqual(mock_execute.call_count, 1)
+        self.assertEqual(mock_execute.call_args[0][0], 'setxkbmap')
+        self.assertEqual(mock_set_list.call_count, 1)
+        self.assertEqual(mock_set_list.call_args[0][0],
+            'org.gnome.libgnomekbd.keyboard')
+        self.assertEqual(mock_set_list.call_args[0][1], 'layouts')
+        self.assertEqual('cn', mock_set_list.call_args[0][2][0])
+        self.assertEqual(len(mock_set_list.call_args[0][2]), 1)
+
+    @mock.patch('ubiquity.gsettings.set_list')
+    @mock.patch('ubiquity.misc.execute')
+    def test_set_indicator_keymaps_unknown(self, mock_execute, mock_set_list):
+        misc.set_indicator_keymaps('unknownlanguage')
+        self.assertEqual(mock_execute.call_count, 0)
+        self.assertEqual(mock_set_list.call_count, 0)
+
 #class PartedServerTests(unittest.TestCase):
 #    def setUp(self):
 #        patcher = mock.patch('ubiquity.parted_server.PartedServer')

=== modified file 'ubiquity/misc.py'
--- ubiquity/misc.py	2012-03-19 20:24:05 +0000
+++ ubiquity/misc.py	2012-03-20 13:43:22 +0000
@@ -581,6 +581,7 @@
 
     xpath = "//iso_639_3_entry[@part1_code='%s']"
     gsettings_key = ['org.gnome.libgnomekbd.keyboard','layouts']
+    lang = lang.split('_')[0]
     variants = []
 
     # Map inspired from that of gfxboot-theme-ubuntu that's itself
@@ -691,9 +692,9 @@
     fp = libxml2.parseFile('/usr/share/xml/iso-codes/iso_639_3.xml')
     context = fp.xpathNewContext()
     nodes = context.xpathEvalExpression(xpath % lang)
+    display = GdkX11.x11_get_default_xdisplay()
+    engine = Xkl.Engine.get_instance(display)
     if nodes:
-        display = GdkX11.x11_get_default_xdisplay()
-        engine = Xkl.Engine.get_instance(display)
         configreg = Xkl.ConfigRegistry.get_instance(engine)
         configreg.load(False)