diff --git a/Lib/cgitb.py b/Lib/cgitb.py index 4f81271be3ca786..98d6ccbb4351256 100644 --- a/Lib/cgitb.py +++ b/Lib/cgitb.py @@ -45,19 +45,19 @@ def reset(): __UNDEF__ = [] # a special sentinel object def small(text): if text: - return '' + text + '' + return f'{text}' else: return '' def strong(text): if text: - return '' + text + '' + return f'{text}' else: return '' def grey(text): if text: - return '' + text + '' + return f'{text}' else: return '' @@ -91,7 +91,7 @@ def scanvars(reader, frame, locals): where, value = lookup(token, frame, locals) vars.append((token, where, value)) elif token == '.': - prefix += lasttoken + '.' + prefix += f"{lasttoken}." parent = value else: parent, prefix = None, '' @@ -103,6 +103,7 @@ def html(einfo, context=5): etype, evalue, etb = einfo if isinstance(etype, type): etype = etype.__name__ + pyver = f'Python {sys.version.split()[0]}:{sys.executable}' pyver = 'Python ' + sys.version.split()[0] + ': ' + sys.executable date = time.ctime(time.time()) head = '' + pydoc.html.heading( @@ -143,8 +144,8 @@ def reader(lnum=[lnum]): for line in lines: num = small(' ' * (5-len(str(i))) + str(i)) + ' ' if i in highlight: - line = '=>%s%s' % (num, pydoc.html.preformat(line)) - rows.append('%s' % line) + line = f'=>{num}{pydoc.html.preformat(line)}' + rows.append(f'{line}') else: line = '  %s%s' % (num, pydoc.html.preformat(line)) rows.append('%s' % grey(line)) @@ -163,7 +164,7 @@ def reader(lnum=[lnum]): name = where + strong(name.split('.')[-1]) dump.append('%s = %s' % (name, pydoc.html.repr(value))) else: - dump.append(name + ' undefined') + dump.append(f'{name} undefined') rows.append('%s' % small(grey(', '.join(dump)))) frames.append('''