Merge pull request #740 from AA-Turner/f-strings

Use f-strings

Author: cdce8p

flit/__init__.py

@@ -42,17 +42,16 @@ def find_python_executable(python: Optional[str] = None) -> str:
     # see https://github.com/pypa/flit/pull/300 and https://bugs.python.org/issue38905
     resolved_python = shutil.which(python)
     if resolved_python is None:
-        raise PythonNotFoundError("Unable to resolve Python executable {!r}".format(python))
+        raise PythonNotFoundError(f"Unable to resolve Python executable {python!r}")
     try:
         return subprocess.check_output(
             [resolved_python, "-c", "import sys; print(sys.executable)"],
             universal_newlines=True,
         ).strip()
     except Exception as e:
         raise PythonNotFoundError(
-            "{} occurred trying to find the absolute filepath of Python executable {!r} ({!r})".format(
-                e.__class__.__name__, python, resolved_python
-            )
+            f"{e.__class__.__name__} occurred trying to find the absolute filepath "
+            f"of Python executable {python!r} ({resolved_python!r})"
         ) from e
 
 
@@ -175,7 +174,7 @@ def main(argv=None):
                  "'python3 -m flit.tomlify' to convert it to pyproject.toml")
 
     if args.subcmd not in {'init'} and not args.ini_file.is_file():
-        sys.exit('Config file {} does not exist'.format(args.ini_file))
+        sys.exit(f'Config file {args.ini_file} does not exist')
 
     enable_colourful_output(logging.DEBUG if args.debug else logging.INFO)
 

flit/build.py

@@ -31,7 +31,7 @@ def main(ini_file: Path, formats=None, gen_setup_py=True, use_vcs=True):
     if not formats:
         formats = ALL_FORMATS
     elif not formats.issubset(ALL_FORMATS):
-        raise ValueError("Unknown package formats: {}".format(formats - ALL_FORMATS))
+        raise ValueError(f"Unknown package formats: {formats - ALL_FORMATS}")
 
     sdist_info = wheel_info = None
     dist_dir = ini_file.parent / 'dist'
@@ -55,6 +55,6 @@ def main(ini_file: Path, formats=None, gen_setup_py=True, use_vcs=True):
         elif 'wheel' in formats:
             wheel_info = make_wheel_in(ini_file, dist_dir)
     except ConfigError as e:
-        sys.exit('Config error: {}'.format(e))
+        sys.exit(f'Config error: {e}')
 
     return SimpleNamespace(wheel=wheel_info, sdist=sdist_info)

flit/init.py

@@ -107,7 +107,7 @@ def guess_module_name(self):
     def update_defaults(self, author, author_email, module, home_page, license):
         new_defaults = {'author': author, 'author_email': author_email,
                         'license': license}
-        name_chunk_pat = r'\b{}\b'.format(re.escape(module))
+        name_chunk_pat = rf'\b{re.escape(module)}\b'
         if re.search(name_chunk_pat, home_page):
             new_defaults['home_page_template'] = \
                 re.sub(name_chunk_pat, '{modulename}', home_page, flags=re.I)
@@ -136,7 +136,7 @@ def find_readme(self):
 class TerminalIniter(IniterBase):
     def prompt_text(self, prompt, default, validator, retry_msg="Try again."):
         if default is not None:
-            p = "{} [{}]: ".format(prompt, default)
+            p = f"{prompt} [{default}]: "
         else:
             p = prompt + ': '
         while True:
@@ -153,14 +153,14 @@ def prompt_options(self, prompt, options, default=None):
 
         print(prompt)
         for i, (key, text) in enumerate(options, start=1):
-            print("{}. {}".format(i, text))
+            print(f"{i}. {text}")
             if key == default:
                 default_ix = i
 
         while True:
             p = "Enter 1-" + str(len(options))
             if default_ix is not None:
-                p += ' [{}]'.format(default_ix)
+                p += f' [{default_ix}]'
             response = input(p+': ')
             if (default_ix is not None) and response == '':
                 return default

flit/install.py

@@ -187,8 +187,7 @@ def install_scripts(self, script_defs, scripts_dir):
 
             if sys.platform == 'win32':
                 cmd_file = script_file.with_suffix('.cmd')
-                cmd = '@echo off\r\n"{python}" "%~dp0\\{script}" %*\r\n'.format(
-                            python=self.python, script=name)
+                cmd = f'@echo off\r\n"{self.python}" "%~dp0\\{name}" %*\r\n'
                 log.debug("Writing script wrapper to %s", cmd_file)
                 with cmd_file.open('w') as f:
                     f.write(cmd)

flit/log.py

@@ -88,8 +88,7 @@ def __init__(self, color=True, datefmt=None):
 
     def formatMessage(self, record):
         l = len(record.message)
-        right_text = '{initial}-{name}'.format(initial=record.levelname[0],
-                                               name=record.name)
+        right_text = f'{record.levelname[0]}-{record.name}'
         if l + len(right_text) < self.termwidth:
             space = ' ' * (self.termwidth - (l + len(right_text)))
         else:

flit/sdist.py

@@ -202,37 +202,37 @@ def make_setup_py(self):
         before, extra = [], []
         if self.module.is_package:
             packages, package_data = auto_packages(self.module)
-            before.append("packages = \\\n%s\n" % pformat(sorted(packages)))
-            before.append("package_data = \\\n%s\n" % pformat(package_data))
+            before.append(f"packages = \\\n{pformat(sorted(packages))}\n")
+            before.append(f"package_data = \\\n{pformat(package_data)}\n")
             extra.append("packages=packages,")
             extra.append("package_data=package_data,")
         else:
-            extra.append("py_modules={!r},".format([self.module.name]))
+            extra.append(f"py_modules={[self.module.name]!r},")
             if self.module.in_namespace_package:
                 packages = list(namespace_packages(self.module))
-                before.append("packages = \\\n%s\n" % pformat(packages))
+                before.append(f"packages = \\\n{pformat(packages)}\n")
                 extra.append("packages=packages,")
 
         if self.module.prefix:
             package_dir = pformat({'': self.module.prefix})
-            before.append("package_dir = \\\n%s\n" % package_dir)
+            before.append(f"package_dir = \\\n{package_dir}\n")
             extra.append("package_dir=package_dir,")
 
         install_reqs, extra_reqs = convert_requires(self.reqs_by_extra)
         if install_reqs:
-            before.append("install_requires = \\\n%s\n" % pformat(install_reqs))
+            before.append(f"install_requires = \\\n{pformat(install_reqs)}\n")
             extra.append("install_requires=install_requires,")
         if extra_reqs:
-            before.append("extras_require = \\\n%s\n" % pformat(extra_reqs))
+            before.append(f"extras_require = \\\n{pformat(extra_reqs)}\n")
             extra.append("extras_require=extras_require,")
 
         entrypoints = self.prep_entry_points()
         if entrypoints:
-            before.append("entry_points = \\\n%s\n" % pformat(entrypoints))
+            before.append(f"entry_points = \\\n{pformat(entrypoints)}\n")
             extra.append("entry_points=entry_points,")
 
         if self.metadata.requires_python:
-            extra.append('python_requires=%r,' % self.metadata.requires_python)
+            extra.append(f'python_requires={self.metadata.requires_python!r},')
 
         return SETUP.format(
             before='\n'.join(before),

flit/tomlify.py

@@ -60,8 +60,8 @@ def convert(path):
                 continue
 
             if '.' in groupname:
-                groupname = '"{}"'.format(groupname)
-            f.write('\n[tool.flit.entrypoints.{}]\n'.format(groupname))
+                groupname = f'"{groupname}"'
+            f.write(f'\n[tool.flit.entrypoints.{groupname}]\n')
             f.write(tomli_w.dumps(OrderedDict(group)))
             written_entrypoints = True
 

flit/upload.py

@@ -158,7 +158,7 @@ def write_pypirc(repo, file="~/.pypirc"):
 
     with open(file, 'w', encoding='utf-8') as f:
         f.write("[pypi]\n"
-                "username = %s\n" % repo.username)
+                f"username = {repo.username}\n")
 
 def get_password(repo: RepoDetails):
     try:

flit/validate.py

@@ -84,7 +84,7 @@ def _download_and_cache_classifiers():
 def _verify_classifiers(classifiers, valid_classifiers):
     """Check classifiers against a set of known classifiers"""
     invalid = classifiers - valid_classifiers
-    return ["Unrecognised classifier: {!r}".format(c)
+    return [f"Unrecognised classifier: {c!r}"
             for c in sorted(invalid)]
 
 
@@ -152,8 +152,7 @@ def _is_identifier_attr(s):
                 valid = _is_identifier_attr(v)
 
             if not valid:
-                problems.append('Invalid entry point in group {}: '
-                                '{} = {}'.format(groupname, k, v))
+                problems.append(f'Invalid entry point in group {groupname}: {k} = {v}')
     return problems
 
 # Distribution name, not quite the same as a Python identifier
@@ -171,7 +170,7 @@ def validate_name(metadata):
     name = metadata.get('name', None)
     if name is None or NAME.match(name):
         return []
-    return ['Invalid name: {!r}'.format(name)]
+    return [f'Invalid name: {name!r}']
 
 
 def _valid_version_specifier(s):
@@ -184,7 +183,7 @@ def validate_requires_python(metadata):
     spec = metadata.get('requires_python', None)
     if spec is None or _valid_version_specifier(spec):
         return []
-    return ['Invalid requires-python: {!r}'.format(spec)]
+    return [f'Invalid requires-python: {spec!r}']
 
 MARKER_VARS = {
     'python_version', 'python_full_version', 'os_name', 'sys_platform',
@@ -200,38 +199,37 @@ def validate_environment_marker(em):
         # TODO: validate parentheses properly. They're allowed by PEP 508.
         parts = MARKER_OP.split(c.strip('()'))
         if len(parts) != 3:
-            problems.append("Invalid expression in environment marker: {!r}".format(c))
+            problems.append(f"Invalid expression in environment marker: {c!r}")
             continue
         l, op, r = parts
         for var in (l.strip(), r.strip()):
             if var[:1] in {'"', "'"}:
                 if len(var) < 2 or var[-1:] != var[:1]:
-                    problems.append("Invalid string in environment marker: {}".format(var))
+                    problems.append(f"Invalid string in environment marker: {var}")
             elif var not in MARKER_VARS:
-                problems.append("Invalid variable name in environment marker: {!r}".format(var))
+                problems.append(f"Invalid variable name in environment marker: {var!r}")
     return problems
 
 def validate_requires_dist(metadata):
     probs = []
     for req in metadata.get('requires_dist', []):
         m = REQUIREMENT.match(req)
         if not m:
-            probs.append("Could not parse requirement: {!r}".format(req))
+            probs.append(f"Could not parse requirement: {req!r}")
             continue
 
         extras, version, envmark = m.group('extras', 'version', 'envmark')
         if not (extras is None or all(NAME.match(e.strip())
                                       for e in extras[1:-1].split(','))):
-            probs.append("Invalid extras in requirement: {!r}".format(req))
+            probs.append(f"Invalid extras in requirement: {req!r}")
         if version is not None:
             if version.startswith('(') and version.endswith(')'):
                 version = version[1:-1]
             if version.startswith('@'):
                 pass  # url specifier  TODO: validate URL
             elif not _valid_version_specifier(version):
                 print((extras, version, envmark))
-                probs.append("Invalid version specifier {!r} in requirement {!r}"
-                             .format(version, req))
+                probs.append(f"Invalid version specifier {version!r} in requirement {req!r}")
         if envmark is not None:
             probs.extend(validate_environment_marker(envmark[1:]))
     return probs
@@ -241,8 +239,7 @@ def validate_url(url):
         return []
     probs = []
     if not url.startswith(('http://', 'https://')):
-        probs.append("URL {!r} doesn't start with https:// or http://"
-                     .format(url))
+        probs.append(f"URL {url!r} doesn't start with https:// or http://")
     elif not url.split('//', 1)[1]:
         probs.append("URL missing address")
     return probs
@@ -253,10 +250,9 @@ def validate_project_urls(metadata):
         name, url = prurl.split(',', 1)
         url = url.lstrip()
         if not name:
-            probs.append("No name for project URL {!r}".format(url))
+            probs.append(f"No name for project URL {url!r}")
         elif len(name) > 32:
-            probs.append("Project URL name {!r} longer than 32 characters"
-                         .format(name))
+            probs.append(f"Project URL name {name!r} longer than 32 characters")
         probs.extend(validate_url(url))
 
     return probs