remove --py36 (#724)

[etc/vim.git] / black.py

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]