'Refactored by Sourcery'

iterative · Nov 18, 2022 · 626061d · 626061d
1 parent 3b16403
commit 626061d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/shtab/__init__.py b/shtab/__init__.py
@@ -219,8 +219,9 @@ def recurse(parser, prefix):
                                 new_nargs,
                             ) = recurse(
                                 positional.choices[choice],
-                                prefix + "_" + wordify(choice),
+                                f"{prefix}_{wordify(choice)}",
                             )
+
                             sub_subparsers.extend(new_subparsers)
                             sub_option_strings.extend(new_option_strings)
                             sub_compgens.extend(new_compgens)
@@ -541,7 +542,7 @@ def recurse(parser, prefix, paths=None):
                         format_positional(opt) for opt in subparser._get_positional_actions()
                         if not isinstance(opt.choices, dict) if opt.help != SUPPRESS)
 
-                    new_pref = prefix + "_" + wordify(cmd)
+                    new_pref = f"{prefix}_{wordify(cmd)}"
                     options = all_commands[new_pref] = {
                         "cmd": cmd, "help": (subparser.description or "").strip().split("\n")[0],
                         "arguments": arguments, "paths": [*paths, cmd]}

diff --git a/tests/test_shtab.py b/tests/test_shtab.py
@@ -24,17 +24,20 @@ def test(self, cmd="1", failure_message=""):
         proc = subprocess.Popen([
             "bash", "-o", "pipefail", "-ec", "{init}[[ {cmd} ]]".format(init=init, cmd=cmd)])
         stdout, stderr = proc.communicate()
-        assert (0 == proc.wait() and not stdout and not stderr), """\
+        assert (
+            proc.wait() == 0 and not stdout and not stderr
+        ), """\
 {}
 {}
 === stdout ===
 {}=== stderr ===
-{}""".format(failure_message, cmd, stdout or "", stderr or "")
+{}""".format(
+            failure_message, cmd, stdout or "", stderr or ""
+        )
 
     def compgen(self, compgen_cmd, word, expected_completions, failure_message=""):
         self.test(
-            '"$(echo $(compgen {} -- "{}"))" = "{}"'.format(compgen_cmd, word,
-                                                            expected_completions),
+            f'"$(echo $(compgen {compgen_cmd} -- "{word}"))" = "{expected_completions}"',
             failure_message,
         )