Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

created fstrings #2784

Merged
merged 2 commits into from
Mar 10, 2023
Merged

created fstrings #2784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
899a0a9
created fstrings
marksmayo Mar 10, 2023
3e5273a
black formatting after f-string
marksmayo Mar 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion codespell_lib/_codespell.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,7 @@ def print_context(
# context = (context_before, context_after)
for i in range(index - context[0], index + context[1] + 1):
if 0 <= i < len(lines):
print("{} {}".format(">" if i == index else ":", lines[i].rstrip()))
print(f"{'>' if i == index else ':'} {lines[i].rstrip()}")


def _ignore_word_sub(
Expand Down
15 changes: 6 additions & 9 deletions codespell_lib/tests/test_dictionary.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
# Filename, should be seen as errors in aspell or not
_data_dir = op.join(op.dirname(__file__), "..", "data")
_fnames_in_aspell = [
(op.join(_data_dir, "dictionary%s.txt" % d[2]), d[3:5], d[5:7])
(op.join(_data_dir, f"dictionary{d[2]}.txt"), d[3:5], d[5:7])
for d in _builtin_dictionaries
]
fname_params = pytest.mark.parametrize(
Expand Down Expand Up @@ -89,10 +89,7 @@ def _check_aspell(
spellers[lang].check(phrase.encode(spellers[lang].ConfigKeys()["encoding"][1]))
for lang in languages
)
end = "be in aspell dictionaries ({}) for dictionary {}".format(
", ".join(languages),
fname,
)
end = f"be in aspell dictionaries ({', '.join(languages)}) for dictionary {fname}"
if in_aspell: # should be an error in aspell
assert this_in_aspell, f"{msg} should {end}"
else: # shouldn't be
Expand All @@ -116,8 +113,8 @@ def _check_err_rep(
fname: str,
languages: Tuple[Iterable[str], Iterable[str]],
) -> None:
assert whitespace.search(err) is None, "error %r has whitespace" % err
assert "," not in err, "error %r has a comma" % err
assert whitespace.search(err) is None, f"error {err!r} has whitespace"
assert "," not in err, f"error {err!r} has a comma"
assert len(rep) > 0, f"error {err}: correction {rep!r} must be non-empty"
assert not start_whitespace.match(
rep
Expand All @@ -143,7 +140,7 @@ def _check_err_rep(
if rep.count(","):
assert rep.endswith(
","
), "error %s: multiple corrections must end " 'with trailing ","' % (err,)
), f'error {err}: multiple corrections must end with trailing ","'
reps = [r.strip() for r in rep.split(",")]
reps = [r for r in reps if len(r)]
for r in reps:
Expand All @@ -162,7 +159,7 @@ def _check_err_rep(
reps = [r.lower() for r in reps]
assert len(set(reps)) == len(
reps
), 'error %s: corrections "%s" are not ' "(lower-case) unique" % (err, rep)
), f'error {err}: corrections "{rep}" are not (lower-case) unique'


@pytest.mark.parametrize(
Expand Down