diff options
author | Tim Harder <radhermit@gmail.com> | 2021-03-16 16:02:17 -0600 |
---|---|---|
committer | Tim Harder <radhermit@gmail.com> | 2021-03-16 16:02:17 -0600 |
commit | fdf4af6fabed91ff3e32b86c1992cae1bdc043dd (patch) | |
tree | 61481863b9113ff33c59689f23853f3a1a0decfd /src/snakeoil/dist | |
parent | dist.generate_man_rsts: use raw strings for regexes (diff) | |
download | snakeoil-fdf4af6fabed91ff3e32b86c1992cae1bdc043dd.tar.gz snakeoil-fdf4af6fabed91ff3e32b86c1992cae1bdc043dd.tar.bz2 snakeoil-fdf4af6fabed91ff3e32b86c1992cae1bdc043dd.zip |
dist.generate_man_rsts: use f-strings instead of '%' formatting
Diffstat (limited to 'src/snakeoil/dist')
-rw-r--r-- | src/snakeoil/dist/generate_man_rsts.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/snakeoil/dist/generate_man_rsts.py b/src/snakeoil/dist/generate_man_rsts.py index 0dd56ee7..81964423 100644 --- a/src/snakeoil/dist/generate_man_rsts.py +++ b/src/snakeoil/dist/generate_man_rsts.py @@ -57,7 +57,7 @@ class ManConverter: # Specifically return '|' w/out spaces; later code is # space sensitive. We do the appropriate replacement as # the last step. - return "<%s>" % ('|'.join(array),) + return fr"<{'|'.join(array)}>" text = self.arg_enumeration_re.sub(f, text) # Now that we've convert {x,y} style options, we need to next # convert multi-argument options into a form that is parsable @@ -66,9 +66,9 @@ class ManConverter: for chunk in text.split(','): chunk = chunk.split() if len(chunk) > 2: - chunk[1:] = ["<%s>" % (' '.join(chunk[1:]),)] + chunk[1:] = [f"<{' '.join(chunk[1:])}>"] if not chunk[0].startswith('-'): - chunk[0] = ':%s:' % (chunk[0],) + chunk[0] = f':{chunk[0]}:' l.append(' '.join(chunk)) # Recompose the options into one text field. text = ', '.join(l) @@ -113,7 +113,7 @@ class ManConverter: self.header_char = header_chars[len(name.split(' ')) - 1] def run(self): - sys.stdout.write("regenerating rst for %s\n" % (self.name,)) + sys.stdout.write(f"regenerating rst for {self.name}\n") for filename, data in self.process_parser(self.parser, self.name): with open(os.path.join(self.out_path, filename + '.rst'), "w") as f: f.write("\n".join(data)) @@ -151,12 +151,12 @@ class ManConverter: for subcommand, parser in action_group._group_actions[0].choices.items(): self.__class__( - self.base_path, '%s %s' % (self.name, subcommand), parser, + self.base_path, f'{self.name} {subcommand}', parser, mtime=self.mtime, replace_cmd=self.replace_cmd).run() subcmds = [] for subcommand in action_group._group_actions[0].choices: - subcmds.append('.. include:: %s.rst' % (subcommand,)) + subcmds.append(f'.. include:: {subcommand}.rst') subcmds.append('') return l, subcmds @@ -226,12 +226,12 @@ class ManConverter: # get the short description for the header desc = getattr(parser, '_description', parser.description) desc = ' - ' + desc if desc else '' - rst = _rst_header(self.header_char, '%s%s' % (name, desc), + rst = _rst_header(self.header_char, f'{name}{desc}', leading=main_command, capitalize=False) cmd = cmd_parts[-1] for filename in ('synopsis', 'description', 'options', 'subcommands'): - rst.append(".. include:: %s/_%s.rst" % (cmd, filename)) + rst.append(f'.. include:: {cmd}/_{filename}.rst') rst = '\n'.join(rst) if main_command: |