Switching to f-strings where appropriate

scripts/wk/__init__.py

@@ -1,7 +1,7 @@
 '''WizardKit: wk module init'''
 # vim: sts=2 sw=2 ts=2
 
-import sys
+from sys import version_info as version
 
 from wk import cfg
 from wk import exe
@@ -16,12 +16,11 @@ from wk import sw
 
 
 # Check env
-if sys.version_info < (3, 7):
+if version < (3, 7):
   # Unsupported
   raise RuntimeError(
-    'This package is unsupported on Python {major}.{minor}'.format(
+    f'This package is unsupported on Python {version.major}.{version.minor}'
-      **sys.version_info,
+    )
-      ))
 
 # Init
 try:

scripts/wk/log.py

@@ -69,16 +69,13 @@ def update_log_path(dest_dir, dest_name=''):
   dest = pathlib.Path(dest_dir)
   dest = dest.expanduser()
   if dest_name:
-    dest_name = '{name}_{datetime}.log'.format(
+    dest_name = f'{dest_name}_{time.strftime("%Y-%m-%d_%H%M%S%z")}.log'
-      name=dest_name,
-      datetime=time.strftime('%Y-%m-%d_%H%M%S%z'),
-      )
 
   # Safety checks
   if len(root_logger.handlers) > 1:
-    raise NotImplementedError('update_log_path() only supports a single handler.')
+    raise NotImplementedError('Multiple handlers not supported')
   if not isinstance(cur_handler, logging.FileHandler):
-    raise NotImplementedError('update_log_path() only supports FileHandlers.')
+    raise NotImplementedError('Only FileHandlers are supported')
 
   # Copy original log to new location
   source = pathlib.Path(cur_handler.baseFilename)
@@ -89,7 +86,7 @@ def update_log_path(dest_dir, dest_name=''):
     dest = dest.joinpath(source.name)
   dest = dest.resolve()
   if dest.exists():
-    raise FileExistsError('Refusing to clobber: {}'.format(dest))
+    raise FileExistsError(f'Refusing to clobber: {dest}')
   os.makedirs(dest.parent, exist_ok=True)
   shutil.copy(source, dest)
 

scripts/wk/std.py

@@ -1,6 +1,5 @@
 '''WizardKit: Standard Functions'''
 # vim: sts=2 sw=2 ts=2
-#TODO Replace .format()s with f-strings
 
 import itertools
 import logging
@@ -74,7 +73,7 @@ def abort(prompt='Aborted.', show_prompt=True, return_code=1):
 def ask(prompt='Kotaero!'):
   """Prompt the user with a Y/N question, returns bool."""
   answer = None
-  prompt = '{} [Y/N]: '.format(prompt)
+  prompt = f'{prompt} [Y/N]: '
 
   # Loop until acceptable answer is given
   while answer is None:
@@ -135,12 +134,8 @@ def bytes_to_string(size, decimals=0, use_binary=True):
     units = 'K' + suffix
   else:
     size /= scale ** 0
-    units = ' {}B'.format(' ' if use_binary else '')
+    units = f' {" " if use_binary else ""}B'
-  size = '{size:0.{decimals}f} {units}'.format(
+  size = f'{size:0.{decimals}f} {units}'
-    size=size,
-    decimals=decimals,
-    units=units,
-    )
 
   # Done
   LOG.debug('string: %s', size)
@@ -156,8 +151,8 @@ def choice(choices, prompt='答えろ！'):
   LOG.debug('choices: %s, prompt: %s', choices, prompt)
   answer = None
   choices = [str(c).upper()[:1] for c in choices]
-  prompt = '{} [{}]: '.format(prompt, '/'.join(choices))
+  prompt = f'{prompt} [{"/".join(choices)}]'
-  regex = '^({})$'.format('|'.join(choices))
+  regex = f'^({"|".join(choices)})$'
 
   # Loop until acceptable answer is given
   while answer is None:
@@ -316,18 +311,18 @@ def generate_debug_report():
   report.append('--- Start debug info ---')
   report.append('')
   report.append('[System]')
-  report.append('  {:<24} {}'.format('FQDN', socket.getfqdn()))
+  report.append(f'  {"FQDN":<24} {socket.getfqdn()}')
   for func in platform_function_list:
     func_name = func.replace('_', ' ').capitalize()
     func_result = getattr(platform, func)()
-    report.append('  {:<24} {}'.format(func_name, func_result))
+    report.append(f'  {func_name:<24} {func_result}')
-  report.append('  {:<24} {}'.format('Python sys.argv', sys.argv))
+  report.append(f'  {"Python sys.argv":<24} {sys.argv}')
   report.append('')
 
   # Environment
   report.append('[Environment Variables]')
   for key, value in sorted(os.environ.items()):
-    report.append('  {:<24} {}'.format(key, value))
+    report.append(f'  {key:<24} {value}')
   report.append('')
 
   # Done
@@ -368,9 +363,7 @@ def major_exception():
   report = generate_debug_report()
 
   # Upload details
-  prompt = 'Upload details to {}?'.format(
+  prompt = f'Upload details to {CRASH_SERVER.get("Name", "?")}?'
-    CRASH_SERVER.get('Name', '?'),
-    )
   if ENABLED_UPLOAD_DATA and ask(prompt):
     print('Uploading... ', end='', flush=True)
     try:
@@ -395,6 +388,7 @@ def pause(prompt='Press Enter to continue... '):
 def print_colored(strings, colors, **kwargs):
   """Prints strings in the colors specified."""
   LOG.debug('strings: %s, colors: %s, kwargs: %s', strings, colors, kwargs)
+  clear_code = COLORS['CLEAR']
   msg = ''
   print_options = {
     'end': kwargs.get('end', '\n'),
@@ -404,11 +398,8 @@ def print_colored(strings, colors, **kwargs):
 
   # Build new string with color escapes added
   for string, color in itertools.zip_longest(strings, colors):
-    msg += '{}{}{}'.format(
+    color_code = COLORS.get(color, clear_code)
-      COLORS.get(color, COLORS['CLEAR']),
+    msg += f'{color_code}{string}{clear_code}'
-      string,
-      COLORS['CLEAR'],
-      )
 
   print(msg, **print_options)
 
@@ -446,7 +437,7 @@ def print_warning(msg, **kwargs):
 def set_title(title):
   """Set window title."""
   if os.name == 'nt':
-    os.system('title {}'.format(title))
+    os.system(f'title {title}')
   else:
     raise NotImplementedError
 
@@ -465,7 +456,7 @@ def string_to_bytes(size, assume_binary=False):
 
   # Raise exception if string can't be parsed as a size
   if not tmp:
-    raise ValueError('Invalid size string: {}'.format(size))
+    raise ValueError(f'Invalid size string: {size}')
 
   # Set scale
   if tmp.group('binary') or assume_binary:
@@ -606,11 +597,7 @@ def upload_debug_report(report, compress=True, reason='DEBUG'):
   if log_path:
     # Strip everything but the prefix
     filename = re.sub(r'^(.*)_(\d{4}-\d{2}-\d{2}.*)', r'\1', log_path.name)
-  filename = '{prefix}_{reason}_{datetime}.log'.format(
+  filename = f'{filename}_{reason}_{time.strftime("%Y-%m-%d_%H%M%S%z")}.log'
-    prefix=filename,
-    reason=reason,
-    datetime=time.strftime('%Y-%m-%d_%H%M%S%z'),
-    )
   LOG.debug('filename: %s', filename)
 
   # Compress report
@@ -619,7 +606,7 @@ def upload_debug_report(report, compress=True, reason='DEBUG'):
     xz_report = lzma.compress(report.encode('utf8'))
 
   # Upload report
-  url = '{}/{}'.format(CRASH_SERVER['Url'], filename)
+  url = f'{CRASH_SERVER["Url"]}/{filename}'
   response = requests.put(
     url,
     data=xz_report if compress else report,