summaryrefslogtreecommitdiff
path: root/coverage/templite.py
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2021-05-01 18:18:11 -0400
committerNed Batchelder <ned@nedbatchelder.com>2021-05-02 07:38:19 -0400
commit4c4ba2e0bc9ec663fa3772d2b088f736345a65a1 (patch)
treea03a2672bfe64141b46243274243377d86c73bb8 /coverage/templite.py
parent236bc9317d208b24b418c9c167f22410613f4ade (diff)
downloadpython-coveragepy-git-4c4ba2e0bc9ec663fa3772d2b088f736345a65a1.tar.gz
refactor: pyupgrade --py36-plus coverage/*.py
Diffstat (limited to 'coverage/templite.py')
-rw-r--r--coverage/templite.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/coverage/templite.py b/coverage/templite.py
index 82673886..2ceeb6e2 100644
--- a/coverage/templite.py
+++ b/coverage/templite.py
@@ -23,7 +23,7 @@ class TempliteValueError(ValueError):
pass
-class CodeBuilder(object):
+class CodeBuilder:
"""Build source code conveniently."""
def __init__(self, indent=0):
@@ -69,7 +69,7 @@ class CodeBuilder(object):
return global_namespace
-class Templite(object):
+class Templite:
"""A simple template renderer, for a nano-subset of Django syntax.
Supported constructs are extended variable access::
@@ -188,7 +188,7 @@ class Templite(object):
ops_stack.append('for')
self._variable(words[1], self.loop_vars)
code.add_line(
- "for c_%s in %s:" % (
+ "for c_{} in {}:".format(
words[1],
self._expr_code(words[3])
)
@@ -228,7 +228,7 @@ class Templite(object):
flush_output()
for var_name in self.all_vars - self.loop_vars:
- vars_code.add_line("c_%s = context[%r]" % (var_name, var_name))
+ vars_code.add_line(f"c_{var_name} = context[{var_name!r}]")
code.add_line('return "".join(result)')
code.dedent()
@@ -241,12 +241,12 @@ class Templite(object):
code = self._expr_code(pipes[0])
for func in pipes[1:]:
self._variable(func, self.all_vars)
- code = "c_%s(%s)" % (func, code)
+ code = f"c_{func}({code})"
elif "." in expr:
dots = expr.split(".")
code = self._expr_code(dots[0])
args = ", ".join(repr(d) for d in dots[1:])
- code = "do_dots(%s, %s)" % (code, args)
+ code = f"do_dots({code}, {args})"
else:
self._variable(expr, self.all_vars)
code = "c_%s" % expr
@@ -254,7 +254,7 @@ class Templite(object):
def _syntax_error(self, msg, thing):
"""Raise a syntax error using `msg`, and showing `thing`."""
- raise TempliteSyntaxError("%s: %r" % (msg, thing))
+ raise TempliteSyntaxError(f"{msg}: {thing!r}")
def _variable(self, name, vars_set):
"""Track that `name` is used as a variable.
@@ -290,7 +290,7 @@ class Templite(object):
value = value[dot]
except (TypeError, KeyError):
raise TempliteValueError(
- "Couldn't evaluate %r.%s" % (value, dot)
+ f"Couldn't evaluate {value!r}.{dot}"
)
if callable(value):
value = value()