remove --py36 (#724)

Fixes #703.

diff --git a/README.md b/README.md
index 57272aefc3f85078499b4eccc204a3472dac1ca6..8df2f9edc3c5a2aeaf4fd75559f82d21933fcc44 100644 (file)
--- a/README.md
+++ b/README.md
@@ -77,11 +77,6 @@ Options:
                                   Python versions that should be supported by
                                   Black's output. [default: per-file auto-
                                   detection]
                                   Python versions that should be supported by
                                   Black's output. [default: per-file auto-
                                   detection]

-  --py36                          Allow using Python 3.6-only syntax on all
-                                  input files.  This will put trailing commas
-                                  in function signatures and calls also after
-                                  *args and **kwargs.  [default: per-file
-                                  auto-detection]

   --pyi                           Format all input files like typing stubs
                                   regardless of file extension (useful when
                                   piping source on standard input).
   --pyi                           Format all input files like typing stubs
                                   regardless of file extension (useful when
                                   piping source on standard input).


@@ -576,7 +571,7 @@ to denote a significant space character.
 ```toml
 [tool.black]
 line-length = 88
 ```toml
 [tool.black]
 line-length = 88

-py36 = true
+target_version = ['cpy37']

 include = '\.pyi?$'
 exclude = '''
 
 include = '\.pyi?$'
 exclude = '''
 


@@ -944,6 +939,8 @@ More details can be found in [CONTRIBUTING](CONTRIBUTING.md).
 
 ### 19.2b0
 
 
 ### 19.2b0
 

+* removed `--py36` (use `--target-version=cpy36` instead) (#724)
+

 * long `del` statements are now split into multiple lines (#698)
 
 * *Black* no longer normalizes numeric literals to include `_` separators (#696)
 * long `del` statements are now split into multiple lines (#698)
 
 * *Black* no longer normalizes numeric literals to include `_` separators (#696)

diff --git a/black.py b/black.py
index 8f50d3e217dbf1746036186691ce4cb3f7dbb1fe..2850ae1a19cb0038ce5acd4bbb86837db171cda0 100644 (file)
--- a/black.py
+++ b/black.py
@@ -248,15 +248,6 @@ def read_pyproject_toml(
         "per-file auto-detection]"
     ),
 )
         "per-file auto-detection]"
     ),
 )

-@click.option(
-    "--py36",
-    is_flag=True,
-    help=(
-        "Allow using Python 3.6-only syntax on all input files.  This will put "
-        "trailing commas in function signatures and calls also after *args and "
-        "**kwargs.  [default: per-file auto-detection]"
-    ),
-)

 @click.option(
     "--pyi",
     is_flag=True,
 @click.option(
     "--pyi",
     is_flag=True,


@@ -360,7 +351,6 @@ def main(
     diff: bool,
     fast: bool,
     pyi: bool,
     diff: bool,
     fast: bool,
     pyi: bool,

-    py36: bool,

     skip_string_normalization: bool,
     quiet: bool,
     verbose: bool,
     skip_string_normalization: bool,
     quiet: bool,
     verbose: bool,


@@ -372,13 +362,7 @@ def main(
     """The uncompromising code formatter."""
     write_back = WriteBack.from_configuration(check=check, diff=diff)
     if target_version:
     """The uncompromising code formatter."""
     write_back = WriteBack.from_configuration(check=check, diff=diff)
     if target_version:

-        if py36:
-            err(f"Cannot use both --target-version and --py36")
-            ctx.exit(2)
-        else:
-            versions = set(target_version)
-    elif py36:
-        versions = PY36_VERSIONS
+        versions = set(target_version)

     else:
         # We'll autodetect later.
         versions = set()
     else:
         # We'll autodetect later.
         versions = set()


@@ -2446,8 +2430,8 @@ def delimiter_split(
 ) -> Iterator[Line]:
     """Split according to delimiters of the highest priority.
 
 ) -> Iterator[Line]:
     """Split according to delimiters of the highest priority.
 

-    If `py36` is True, the split will add trailing commas also in function
-    signatures that contain `*` and `**`.
+    If `supports_trailing_commas` is True, the split will add trailing commas
+    also in function signatures that contain `*` and `**`.

     """
     try:
         last_leaf = line.leaves[-1]
     """
     try:
         last_leaf = line.leaves[-1]

diff --git a/pyproject.toml b/pyproject.toml
index fca50554ed354f2a82246a4b5c62c8c6e68bc97d..c42c33f37bad3958777241e21c73f531c9289a18 100644 (file)
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -7,7 +7,7 @@
 
 [tool.black]
 line-length = 88
 
 [tool.black]
 line-length = 88

-py36 = true
+target_version = ['cpy36', 'cpy37', 'cpy38']

 include = '\.pyi?$'
 exclude = '''
 /(
 include = '\.pyi?$'
 exclude = '''
 /(

diff --git a/tests/test_black.py b/tests/test_black.py
index 3404e058e1b069abc46830e41953bb99feeee169..21a7f2d53bdc50b1385303b2ce0306b20a947f03 100644 (file)
--- a/tests/test_black.py
+++ b/tests/test_black.py
@@ -43,6 +43,9 @@ fs = partial(black.format_str, mode=black.FileMode())
 THIS_FILE = Path(__file__)
 THIS_DIR = THIS_FILE.parent
 EMPTY_LINE = "# EMPTY LINE WITH WHITESPACE" + " (this comment will be removed)"
 THIS_FILE = Path(__file__)
 THIS_DIR = THIS_FILE.parent
 EMPTY_LINE = "# EMPTY LINE WITH WHITESPACE" + " (this comment will be removed)"

+PY36_ARGS = [
+    f"--target-version={version.name.lower()}" for version in black.PY36_VERSIONS
+]

 T = TypeVar("T")
 R = TypeVar("R")
 
 T = TypeVar("T")
 R = TypeVar("R")
 


@@ -1160,10 +1163,10 @@ class BlackTestCase(unittest.TestCase):
             path = (workspace / "file.py").resolve()
             with open(path, "w") as fh:
                 fh.write(source)
             path = (workspace / "file.py").resolve()
             with open(path, "w") as fh:
                 fh.write(source)

-            self.invokeBlack([str(path), "--py36"])
+            self.invokeBlack([str(path), *PY36_ARGS])

             with open(path, "r") as fh:
                 actual = fh.read()
             with open(path, "r") as fh:
                 actual = fh.read()

-            # verify cache with --py36 is separate
+            # verify cache with --target-version is separate

             py36_cache = black.read_cache(py36_mode)
             self.assertIn(path, py36_cache)
             normal_cache = black.read_cache(reg_mode)
             py36_cache = black.read_cache(py36_mode)
             self.assertIn(path, py36_cache)
             normal_cache = black.read_cache(reg_mode)


@@ -1183,12 +1186,12 @@ class BlackTestCase(unittest.TestCase):
             for path in paths:
                 with open(path, "w") as fh:
                     fh.write(source)
             for path in paths:
                 with open(path, "w") as fh:
                     fh.write(source)

-            self.invokeBlack([str(p) for p in paths] + ["--py36"])
+            self.invokeBlack([str(p) for p in paths] + PY36_ARGS)

             for path in paths:
                 with open(path, "r") as fh:
                     actual = fh.read()
                 self.assertEqual(actual, expected)
             for path in paths:
                 with open(path, "r") as fh:
                     actual = fh.read()
                 self.assertEqual(actual, expected)

-            # verify cache with --py36 is separate
+            # verify cache with --target-version is separate

             pyi_cache = black.read_cache(py36_mode)
             normal_cache = black.read_cache(reg_mode)
             for path in paths:
             pyi_cache = black.read_cache(py36_mode)
             normal_cache = black.read_cache(reg_mode)
             for path in paths:


@@ -1198,7 +1201,9 @@ class BlackTestCase(unittest.TestCase):
     def test_pipe_force_py36(self) -> None:
         source, expected = read_data("force_py36")
         result = CliRunner().invoke(
     def test_pipe_force_py36(self) -> None:
         source, expected = read_data("force_py36")
         result = CliRunner().invoke(

-            black.main, ["-", "-q", "--py36"], input=BytesIO(source.encode("utf8"))
+            black.main,
+            ["-", "-q", "--target-version=cpy36"],
+            input=BytesIO(source.encode("utf8")),

         )
         self.assertEqual(result.exit_code, 0)
         actual = result.output
         )
         self.assertEqual(result.exit_code, 0)
         actual = result.output