from dataclasses import replace
-from typing import Any, Iterator
+from typing import Any, Iterator, List
from unittest.mock import patch
import pytest
read_data,
)
-SIMPLE_CASES = [
+SIMPLE_CASES: List[str] = [
+ "attribute_access_on_number_literals",
"beginning_backslash",
"bracketmatch",
"class_blank_parentheses",
"fmtskip4",
"fmtskip5",
"fmtskip6",
+ "fmtskip7",
"fstring",
"function",
"function2",
"function_trailing_comma",
"import_spacing",
+ "power_op_spacing",
"remove_parens",
"slices",
"string_prefixes",
+ "torture",
+ "trailing_comma_optional_parens1",
+ "trailing_comma_optional_parens2",
+ "trailing_comma_optional_parens3",
"tricky_unicode_symbols",
"tupleassign",
]
-EXPERIMENTAL_STRING_PROCESSING_CASES = [
+PY310_CASES: List[str] = [
+ "starred_for_target",
+ "pattern_matching_simple",
+ "pattern_matching_complex",
+ "pattern_matching_extras",
+ "pattern_matching_style",
+ "pattern_matching_generic",
+ "parenthesized_context_managers",
+]
+
+PY311_CASES: List[str] = [
+ "pep_654",
+ "pep_654_style",
+]
+
+PREVIEW_CASES: List[str] = [
+ # string processing
"cantfit",
"comments7",
+ "comments8",
"long_strings",
"long_strings__edge_case",
"long_strings__regression",
"percent_precedence",
+ "remove_except_parens",
+ "remove_for_brackets",
+ "one_element_subscript",
+ "remove_await_parens",
+ "return_annotation_brackets",
]
-PY310_CASES = [
- "pattern_matching_simple",
- "pattern_matching_complex",
- "pattern_matching_extras",
- "pattern_matching_style",
- "parenthesized_context_managers",
-]
-
-SOURCES = [
+SOURCES: List[str] = [
"src/black/__init__.py",
"src/black/__main__.py",
"src/black/brackets.py",
"src/black/strings.py",
"src/black/trans.py",
"src/blackd/__init__.py",
- "src/black_primer/cli.py",
- "src/black_primer/lib.py",
"src/blib2to3/pygram.py",
"src/blib2to3/pytree.py",
"src/blib2to3/pgen2/conv.py",
"tests/test_black.py",
"tests/test_blackd.py",
"tests/test_format.py",
- "tests/test_primer.py",
"tests/optional.py",
"tests/util.py",
"tests/conftest.py",
check_file(filename, DEFAULT_MODE)
-@pytest.mark.parametrize("filename", EXPERIMENTAL_STRING_PROCESSING_CASES)
-def test_experimental_format(filename: str) -> None:
- check_file(filename, black.Mode(experimental_string_processing=True))
+@pytest.mark.parametrize("filename", PREVIEW_CASES)
+def test_preview_format(filename: str) -> None:
+ check_file(filename, black.Mode(preview=True))
@pytest.mark.parametrize("filename", SOURCES)
assert_format(source, expected, minimum_version=(3, 8))
+def test_remove_with_brackets() -> None:
+ source, expected = read_data("remove_with_brackets")
+ assert_format(
+ source,
+ expected,
+ black.Mode(preview=True),
+ minimum_version=(3, 9),
+ )
+
+
@pytest.mark.parametrize("filename", PY310_CASES)
def test_python_310(filename: str) -> None:
source, expected = read_data(filename)
assert_format(source, expected, mode, minimum_version=(3, 10))
+def test_python_310_without_target_version() -> None:
+ source, expected = read_data("pattern_matching_simple")
+ mode = black.Mode()
+ assert_format(source, expected, mode, minimum_version=(3, 10))
+
+
def test_patma_invalid() -> None:
source, expected = read_data("pattern_matching_invalid")
mode = black.Mode(target_versions={black.TargetVersion.PY310})
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)
+@pytest.mark.parametrize("filename", PY311_CASES)
+def test_python_311(filename: str) -> None:
+ source, expected = read_data(filename)
+ mode = black.Mode(target_versions={black.TargetVersion.PY311})
+ assert_format(source, expected, mode, minimum_version=(3, 11))
def test_python_2_hint() -> None:
def test_python39() -> None:
source, expected = read_data("python39")
assert_format(source, expected, minimum_version=(3, 9))
+
+
+def test_power_op_newline() -> None:
+ # requires line_length=0
+ source, expected = read_data("power_op_newline")
+ assert_format(source, expected, mode=black.Mode(line_length=0))