]> git.madduck.net Git - etc/vim.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Add back --py36 as a deprecated option (#750)
authorJelle Zijlstra <jelle.zijlstra@gmail.com>
Thu, 14 Mar 2019 16:31:27 +0000 (09:31 -0700)
committerŁukasz Langa <lukasz@langa.pl>
Thu, 14 Mar 2019 16:31:27 +0000 (17:31 +0100)
This partially reverts commit 21ab37a5d92c866a289320cba7c4689df70b3342.

README.md
black.py

index 87ac75751df9032ea0af07ebcc3f16c17367a7a2..2574c55dbd15b095abf3e6fafd1173adc2befe4d 100644 (file)
--- a/README.md
+++ b/README.md
@@ -77,6 +77,12 @@ 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. Deprecated; use
+                                  --target-version instead. [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).
@@ -950,7 +956,7 @@ More details can be found in [CONTRIBUTING](CONTRIBUTING.md).
 * new option `--target-version` to control which Python versions
   *Black*-formatted code should target (#618)
 
 * new option `--target-version` to control which Python versions
   *Black*-formatted code should target (#618)
 
-* removed `--py36` (use `--target-version=py36` instead) (#724)
+* deprecated `--py36` (use `--target-version=py36` instead) (#724)
 
 * *Black* no longer normalizes numeric literals to include `_` separators (#696)
 
 
 * *Black* no longer normalizes numeric literals to include `_` separators (#696)
 
index 31e629b90f9b84b3dbea1747a618b9ba04ac5620..24ff78134c80e53fe98847848093357960df28ff 100644 (file)
--- a/black.py
+++ b/black.py
@@ -246,6 +246,16 @@ 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. Deprecated; use --target-version instead. "
+        "[default: per-file auto-detection]"
+    ),
+)
 @click.option(
     "--pyi",
     is_flag=True,
 @click.option(
     "--pyi",
     is_flag=True,
@@ -349,6 +359,7 @@ 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,
@@ -360,7 +371,17 @@ 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:
-        versions = set(target_version)
+        if py36:
+            err(f"Cannot use both --target-version and --py36")
+            ctx.exit(2)
+        else:
+            versions = set(target_version)
+    elif py36:
+        err(
+            "--py36 is deprecated and will be removed in a future version. "
+            "Use --target-version py36 instead."
+        )
+        versions = PY36_VERSIONS
     else:
         # We'll autodetect later.
         versions = set()
     else:
         # We'll autodetect later.
         versions = set()