diff options
author | Ned Batchelder <ned@nedbatchelder.com> | 2021-11-11 07:23:36 -0500 |
---|---|---|
committer | Ned Batchelder <ned@nedbatchelder.com> | 2021-11-11 07:23:36 -0500 |
commit | 1b94835aac3268a32bfa4ce0df585dbb97457a06 (patch) | |
tree | adbc0aa1467460588e77aa6d574e1ae9abb74f0f /coverage | |
parent | 79f9f4575321fafc2ef770e3255f874db3d4b037 (diff) | |
download | python-coveragepy-git-1b94835aac3268a32bfa4ce0df585dbb97457a06.tar.gz |
style: convert more string formatting to f-strings
Diffstat (limited to 'coverage')
-rw-r--r-- | coverage/disposition.py | 2 | ||||
-rw-r--r-- | coverage/execfile.py | 2 | ||||
-rw-r--r-- | coverage/misc.py | 2 | ||||
-rw-r--r-- | coverage/results.py | 2 | ||||
-rw-r--r-- | coverage/version.py | 2 | ||||
-rw-r--r-- | coverage/xmlreport.py | 4 |
6 files changed, 7 insertions, 7 deletions
diff --git a/coverage/disposition.py b/coverage/disposition.py index 1c39a9c1..30b31af6 100644 --- a/coverage/disposition.py +++ b/coverage/disposition.py @@ -33,7 +33,7 @@ def disposition_debug_msg(disp): if disp.original_filename != disp.source_filename: msg += f" as {disp.source_filename!r}" if disp.file_tracer: - msg += ": will be traced by %r" % disp.file_tracer + msg += f": will be traced by {disp.file_tracer!r}" else: msg = f"Not tracing {disp.original_filename!r}: {disp.reason}" return msg diff --git a/coverage/execfile.py b/coverage/execfile.py index 3da3ba1f..38dc1d07 100644 --- a/coverage/execfile.py +++ b/coverage/execfile.py @@ -144,7 +144,7 @@ class PyRunner: self.arg0 = try_filename break else: - raise NoSource("Can't find '__main__' module in '%s'" % self.arg0) + raise NoSource(f"Can't find '__main__' module in '{self.arg0}'") # Make a spec. I don't know if this is the right way to do it. try_filename = python_reported_file(try_filename) diff --git a/coverage/misc.py b/coverage/misc.py index 584efeaa..fa09f890 100644 --- a/coverage/misc.py +++ b/coverage/misc.py @@ -184,7 +184,7 @@ def bool_or_none(b): def join_regex(regexes): """Combine a list of regexes into one that matches any of them.""" - return "|".join("(?:%s)" % r for r in regexes) + return "|".join(f"(?:{r})" for r in regexes) def file_be_gone(path): diff --git a/coverage/results.py b/coverage/results.py index 11c4b09b..64e5130c 100644 --- a/coverage/results.py +++ b/coverage/results.py @@ -317,7 +317,7 @@ def format_lines(statements, lines, arcs=None): for ex in sorted(exits): if line not in lines and ex not in lines: dest = (ex if ex > 0 else "exit") - line_items.append((line, "%d->%s" % (line, dest))) + line_items.append((line, f"{line}->{dest}")) ret = ', '.join(t[-1] for t in sorted(line_items)) return ret diff --git a/coverage/version.py b/coverage/version.py index 41244144..394cd076 100644 --- a/coverage/version.py +++ b/coverage/version.py @@ -16,7 +16,7 @@ def _make_version(major, minor, micro, releaselevel, serial): version += ".%d" % (micro,) if releaselevel != 'final': short = {'alpha': 'a', 'beta': 'b', 'candidate': 'rc'}[releaselevel] - version += "%s%d" % (short, serial) + version += f"{short}{serial}" return version diff --git a/coverage/xmlreport.py b/coverage/xmlreport.py index 8c8409dc..ebc85de4 100644 --- a/coverage/xmlreport.py +++ b/coverage/xmlreport.py @@ -67,9 +67,9 @@ class XmlReporter: xcoverage.setAttribute("version", __version__) xcoverage.setAttribute("timestamp", str(int(time.time()*1000))) xcoverage.appendChild(self.xml_out.createComment( - " Generated by coverage.py: %s " % __url__ + f" Generated by coverage.py: {__url__} " )) - xcoverage.appendChild(self.xml_out.createComment(" Based on %s " % DTD_URL)) + xcoverage.appendChild(self.xml_out.createComment(f" Based on {DTD_URL} ")) # Call xml_file for each file in the data. for fr, analysis in get_analysis_to_report(self.coverage, morfs): |