Skip to content

Commit

Permalink
tell users to use -t py310 (#2668)
Browse files Browse the repository at this point in the history
  • Loading branch information
JelleZijlstra committed Dec 4, 2021
1 parent f52cb0f commit dc8cdda
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGES.md
Expand Up @@ -4,6 +4,7 @@

### _Black_

- Point users to using `--target-version py310` if we detect 3.10-only syntax (#2668)
- Cell magics are now only processed if they are known Python cell magics. Earlier, all
cell magics were tokenized, leading to possible indentation errors e.g. with
`%%writefile`. (#2630)
Expand Down
24 changes: 23 additions & 1 deletion src/black/parsing.py
Expand Up @@ -43,6 +43,11 @@
ast3 = ast27 = ast


PY310_HINT: Final[
str
] = "Consider using --target-version py310 to parse Python 3.10 code."


class InvalidInput(ValueError):
"""Raised when input source code fails all parse attempts."""

Expand Down Expand Up @@ -96,7 +101,8 @@ def lib2to3_parse(src_txt: str, target_versions: Iterable[TargetVersion] = ()) -
if not src_txt.endswith("\n"):
src_txt += "\n"

for grammar in get_grammars(set(target_versions)):
grammars = get_grammars(set(target_versions))
for grammar in grammars:
drv = driver.Driver(grammar)
try:
result = drv.parse_string(src_txt, True)
Expand All @@ -117,13 +123,29 @@ def lib2to3_parse(src_txt: str, target_versions: Iterable[TargetVersion] = ()) -
exc = InvalidInput(f"Cannot parse: {lineno}:{column}: {te.args[0]}")

else:
if pygram.python_grammar_soft_keywords not in grammars and matches_grammar(
src_txt, pygram.python_grammar_soft_keywords
):
original_msg = exc.args[0]
msg = f"{original_msg}\n{PY310_HINT}"
raise InvalidInput(msg) from None
raise exc from None

if isinstance(result, Leaf):
result = Node(syms.file_input, [result])
return result


def matches_grammar(src_txt: str, grammar: Grammar) -> bool:
drv = driver.Driver(grammar)
try:
drv.parse_string(src_txt, True)
except ParseError:
return False
else:
return True


def lib2to3_unparse(node: Node) -> str:
"""Given a lib2to3 node, return its string representation."""
code = str(node)
Expand Down
9 changes: 9 additions & 0 deletions tests/test_format.py
Expand Up @@ -210,6 +210,15 @@ def test_patma_invalid() -> None:
exc_info.match("Cannot parse: 10:11")


def test_patma_hint() -> None:
source, expected = read_data("pattern_matching_simple")
mode = black.Mode(target_versions={black.TargetVersion.PY39})
with pytest.raises(black.parsing.InvalidInput) as exc_info:
assert_format(source, expected, mode, minimum_version=(3, 10))

exc_info.match(black.parsing.PY310_HINT)


def test_docstring_no_string_normalization() -> None:
"""Like test_docstring but with string normalization off."""
source, expected = read_data("docstring_no_string_normalization")
Expand Down

0 comments on commit dc8cdda

Please sign in to comment.