Fix flake8 configuration by switching from extend-ignore to ignore (#2320)

diff --git a/.flake8 b/.flake8
index 4866133a6a872c6901a6a06fffe4f76a5cba270a..ae11a13347c999a4b1f34f1d77f95f157172de9c 100644 (file)
--- a/.flake8
+++ b/.flake8
@@ -1,5 +1,5 @@
 [flake8]
 [flake8]

-extend-ignore = E203, E266, E501
+ignore = E203, E266, E501, W503

 # line length is intentionally set to 80 here because black uses Bugbear
 # See https://black.readthedocs.io/en/stable/the_black_code_style/current_style.html#line-length for more details
 max-line-length = 80
 # line length is intentionally set to 80 here because black uses Bugbear
 # See https://black.readthedocs.io/en/stable/the_black_code_style/current_style.html#line-length for more details
 max-line-length = 80

diff --git a/src/black/output.py b/src/black/output.py
index 6831524090d9a82107146bf8a89ee815fa58d1c9..c253c85e90e87353b75d47afc35b015395792dea 100644 (file)
--- a/src/black/output.py
+++ b/src/black/output.py
@@ -45,7 +45,8 @@ def diff(a: str, b: str, a_name: str, b_name: str) -> str:
         a_lines, b_lines, fromfile=a_name, tofile=b_name, n=5
     ):
         # Work around https://bugs.python.org/issue2142
         a_lines, b_lines, fromfile=a_name, tofile=b_name, n=5
     ):
         # Work around https://bugs.python.org/issue2142

-        # See https://www.gnu.org/software/diffutils/manual/html_node/Incomplete-Lines.html
+        # See:
+        # https://www.gnu.org/software/diffutils/manual/html_node/Incomplete-Lines.html

         if line[-1] == "\n":
             diff_lines.append(line)
         else:
         if line[-1] == "\n":
             diff_lines.append(line)
         else: