Merge pull request #6232 from jkonecny12/f42-fix-format-string

Fix bad formatting for `format` function
rhinstaller · Mar 5, 2025 · a68b245 · a68b245
2 parents 14577c5 + a85f974
commit a68b245
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/pyanaconda/modules/localization/live_keyboard.py b/pyanaconda/modules/localization/live_keyboard.py
@@ -95,7 +95,7 @@ def _convert_to_xkb_format(self, sources):
             # keep only 'xkb' type and raise an error on 'ibus' variants which can't
             # be used in localed
             if t[0] != "xkb":
-                msg = _("The live system has layout '%s' which can't be used for installation.")
+                msg = _("The live system has layout '{}' which can't be used for installation.")
                 raise KeyboardConfigurationError(msg.format(t[1]))
 
             layout = t[1]

diff --git a/tests/unit_tests/pyanaconda_tests/modules/localization/test_live_keyboard.py b/tests/unit_tests/pyanaconda_tests/modules/localization/test_live_keyboard.py
@@ -42,14 +42,15 @@ def _check_gnome_shell_layouts_conversion(self,
                                               mocked_exec_with_capture,
                                               system_input,
                                               output,
-                                              should_raise):
+                                              unsupported_layout):
         mocked_exec_with_capture.reset_mock()
         mocked_exec_with_capture.return_value = system_input
 
         gs = GnomeShellKeyboard()
 
-        if should_raise:
-            with pytest.raises(KeyboardConfigurationError):
+        if unsupported_layout:
+            match = fr'.*{unsupported_layout}.*'
+            with pytest.raises(KeyboardConfigurationError, match=match):
                 gs.read_keyboard_layouts()
             return
 
@@ -69,45 +70,45 @@ def test_gnome_shell_keyboard(self, mocked_exec_with_capture):
             mocked_exec_with_capture=mocked_exec_with_capture,
             system_input=r"[('xkb', 'cz')]",
             output=["cz"],
-            should_raise=False
+            unsupported_layout=None
         )
 
         # test one complex layout is set
         self._check_gnome_shell_layouts_conversion(
             mocked_exec_with_capture=mocked_exec_with_capture,
             system_input=r"[('xkb', 'cz+qwerty')]",
             output=["cz (qwerty)"],
-            should_raise=False
+            unsupported_layout=None
         )
 
         # test multiple layouts are set
         self._check_gnome_shell_layouts_conversion(
             mocked_exec_with_capture=mocked_exec_with_capture,
             system_input=r"[('xkb', 'cz+qwerty'), ('xkb', 'us'), ('xkb', 'cz+dvorak-ucw')]",
             output=["cz (qwerty)", "us", "cz (dvorak-ucw)"],
-            should_raise=False
+            unsupported_layout=None
         )
 
         # test layouts with ibus (ibus will raise error)
         self._check_gnome_shell_layouts_conversion(
             mocked_exec_with_capture=mocked_exec_with_capture,
             system_input=r"[('xkb', 'cz'), ('ibus', 'libpinyin')]",
             output=[],
-            should_raise=True
+            unsupported_layout='libpinyin'
         )
 
         # test only ibus layout (raise the error)
         self._check_gnome_shell_layouts_conversion(
             mocked_exec_with_capture=mocked_exec_with_capture,
             system_input=r"[('ibus', 'libpinyin')]",
             output=[],
-            should_raise=True
+            unsupported_layout='libpinyin'
         )
 
         # test wrong input
         self._check_gnome_shell_layouts_conversion(
             mocked_exec_with_capture=mocked_exec_with_capture,
             system_input=r"wrong input",
             output=[],
-            should_raise=False
+            unsupported_layout=None
         )