patch main to ensure click_patch() gets called (#572)

diff --git a/README.md b/README.md
index afb160e32ca5280d1abe5a1dd27490dab5b25c63..a2550220e2090ef7828ac9d3e81b43fc8f6f1d72 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1351,3 +1351,4 @@ Multiple contributions by:
 * [Stavros Korokithakis](mailto:hi@stavros.io)
 * [Sunil Kapil](mailto:snlkapil@gmail.com)
 * [Vishwas B Sharma](mailto:sharma.vishwas88@gmail.com)
+* [Chuck Wooters](mailto:chuck.wooters@microsoft.com)

diff --git a/black.py b/black.py
index d06082060a04c2f7b243be46327cc1e23eb1d869..4d8586581c131b20f3c44ad1430a72573bf9fe9a 100644 (file)
--- a/black.py
+++ b/black.py
@@ -3662,6 +3662,10 @@ def patch_click() -> None:
             module._verify_python3_env = lambda: None
 
 
-if __name__ == "__main__":
+def patched_main() -> None:
     patch_click()
     main()
+
+
+if __name__ == "__main__":
+    patched_main()

diff --git a/blackd.py b/blackd.py
index 50614d006704465224acef93404d1f831b5efcf3..e1006a1942b0784fe4b6adaaa25b8564149a29c8 100644 (file)
--- a/blackd.py
+++ b/blackd.py
@@ -108,6 +108,10 @@ async def handle(request: web.Request, executor: Executor) -> web.Response:
         return web.Response(status=500, text=str(e))
 
 
-if __name__ == "__main__":
+def patched_main() -> None:
     black.patch_click()
     main()
+
+
+if __name__ == "__main__":
+    patched_main()

diff --git a/setup.py b/setup.py
index 87583cae03409dc98bf8c8af418adfbf8e0930d4..096be9e49621c96fabda72ad243fd41a2a3873a2 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -57,5 +57,10 @@ setup(
         "Topic :: Software Development :: Libraries :: Python Modules",
         "Topic :: Software Development :: Quality Assurance",
     ],
-    entry_points={"console_scripts": ["black=black:main", "blackd=blackd:main [d]"]},
+    entry_points={
+        "console_scripts": [
+            "black=black:patched_main",
+            "blackd=blackd:patched_main [d]",
+        ]
+    },
 )