]> 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:

Click 8.0 renamed its "die on LANG=C" function so we need to look for that one too...
authorŁukasz Langa <lukasz@langa.pl>
Wed, 12 May 2021 19:47:32 +0000 (21:47 +0200)
committerGitHub <noreply@github.com>
Wed, 12 May 2021 19:47:32 +0000 (21:47 +0200)
CHANGES.md
mypy.ini
src/black/__init__.py

index 38eef524b7cb8d086e0a3e58e7c5fafe9e74600b..becd621dbf209c123084f19ebbf57d46aa0650de 100644 (file)
@@ -1,5 +1,11 @@
 # Change Log
 
+## Unreleased
+
+### _Black_
+
+- Restored compatibility with Click 8.0 on Python 3.6 when LANG=C used (#2227)
+
 ## 21.5b1
 
 ### _Black_
index 589fbf651398900898c3a41a590a026cc70a8c34..ae7be5e510634ef1a4927866318db8a6b0e79d5a 100644 (file)
--- a/mypy.ini
+++ b/mypy.ini
@@ -33,5 +33,7 @@ cache_dir=/dev/null
 
 [mypy-aiohttp.*]
 follow_imports=skip
-[mypy-_version]
-follow_imports=skip
+[mypy-black]
+# The following is because of `patch_click()`. Remove when
+# we drop Python 3.6 support.
+warn_unused_ignores=False
index c61bc8c1d60e2f2b681a663e2b94435ce1439bf0..f46b866c1bd0c28e516122a3952d53fad522bb81 100644 (file)
@@ -1029,7 +1029,7 @@ def nullcontext() -> Iterator[None]:
 
 
 def patch_click() -> None:
-    """Make Click not crash.
+    """Make Click not crash on Python 3.6 with LANG=C.
 
     On certain misconfigured environments, Python 3 selects the ASCII encoding as the
     default which restricts paths that it can access during the lifetime of the
@@ -1047,7 +1047,9 @@ def patch_click() -> None:
 
     for module in (core, _unicodefun):
         if hasattr(module, "_verify_python3_env"):
-            module._verify_python3_env = lambda: None
+            module._verify_python3_env = lambda: None  # type: ignore
+        if hasattr(module, "_verify_python_env"):
+            module._verify_python_env = lambda: None  # type: ignore
 
 
 def patched_main() -> None: