From 27fe335f7401cc866360c561a454dc53859b7670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Cal=C3=A1bkov=C3=A1?= Date: Mon, 10 Mar 2025 16:30:15 +0100 Subject: [PATCH 1/2] compatibility with black 25.1 --- blue/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blue/__init__.py b/blue/__init__.py index c6b60ea..fcd312f 100644 --- a/blue/__init__.py +++ b/blue/__init__.py @@ -99,7 +99,7 @@ def path_hook(cls): LOG = logging.getLogger(__name__) black_format_file_in_place = black.format_file_in_place -black_strings_fix_docstring = black.strings.fix_docstring +black_strings_fix_docstring = black.strings.fix_multiline_docstring black_strings_normalize_string_quotes = black.strings.normalize_string_quotes # Try not to poison Black's cache directory. From 897f8991be82f7eacf07f9c413630834a4c47516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Cal=C3=A1bkov=C3=A1?= Date: Mon, 10 Mar 2025 16:35:43 +0100 Subject: [PATCH 2/2] support also older black --- blue/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/blue/__init__.py b/blue/__init__.py index fcd312f..6ca4a84 100644 --- a/blue/__init__.py +++ b/blue/__init__.py @@ -85,6 +85,10 @@ def path_hook(cls): normalize_string_prefix, sub_twice, ) +try: + from black.strings import fix_docstring as black_strings_fix_docstring +except ImportError: # black 25.1 + from black.strings import fix_multiline_docstring as black_strings_fix_docstring from flake8.options import config as flake8_config from flake8.options import manager as flake8_manager @@ -99,7 +103,6 @@ def path_hook(cls): LOG = logging.getLogger(__name__) black_format_file_in_place = black.format_file_in_place -black_strings_fix_docstring = black.strings.fix_multiline_docstring black_strings_normalize_string_quotes = black.strings.normalize_string_quotes # Try not to poison Black's cache directory.