paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 22:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

python: Convert more percent formatting to Python 3.6 f-strings.

Browse Source 
Generated by pyupgrade --py36-plus.

Now including %d, %i, %u, and multi-line strings.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2020-06-12 23:59:37 -07:00
committed by Tim Abbott
parent 1ed2d9b4a0
commit 74c17bf94a
49 changed files with 217 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
tools/lib/template_parser.py
View File

@@ -157,12 +157,7 @@ def tokenize(text: str) -> List[Token]:
continue
except TokenizationException as e:
raise FormattedException(
'''%s at Line %d Col %d:"%s"''' % (
e.message,
state.line,
state.col,
e.line_content,
),
f'''{e.message} at Line {state.line} Col {state.col}:"{e.line_content}"''',
)
line_span = len(s.split('\n'))
@@ -223,13 +218,13 @@ def validate(fn: Optional[str] = None, text: Optional[str] = None, check_indent:
self.matcher = func
def no_start_tag(token: Token) -> None:
raise TemplateParserException('''
raise TemplateParserException(f'''
No start tag
fn: %s
fn: {fn}
end tag:
%s
line %d, col %d
''' % (fn, token.tag, token.line, token.col))
{token.tag}
line {token.line}, col {token.col}
''')
state = State(no_start_tag)
@@ -261,16 +256,16 @@ def validate(fn: Optional[str] = None, text: Optional[str] = None, check_indent:
if end_col != start_col:
problem = 'Bad indentation.'
if problem:
raise TemplateParserException('''
fn: %s
%s
raise TemplateParserException(f'''
fn: {fn}
{problem}
start:
%s
line %d, col %d
{start_token.s}
line {start_line}, col {start_col}
end tag:
%s
line %d, col %d
''' % (fn, problem, start_token.s, start_line, start_col, end_tag, end_line, end_col))
{end_tag}
line {end_line}, col {end_col}
''')
state.matcher = old_matcher
state.depth -= 1
state.matcher = f