From 40aba49d0d0833edf65ee9d3c3a2b511bac6f2dd Mon Sep 17 00:00:00 2001
From: Anthony Sottile <asottile@umich.edu>
Date: Sun, 14 Mar 2021 11:58:03 -0700
Subject: [PATCH] upgrade pycodestyle to 2.7.0

---
 setup.cfg                      | 2 +-
 src/flake8/processor.py        | 2 ++
 tests/integration/test_main.py | 3 +--
 tests/unit/conftest.py         | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 5046e68..3555655 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -41,7 +41,7 @@ install_requires=
 # And in which releases we will update those ranges here:
 # http://flake8.pycqa.org/en/latest/internal/releases.html#releasing-flake8
     pyflakes >= 2.3.0, < 2.4.0
-    pycodestyle >= 2.6.0a1, < 2.7.0
+    pycodestyle >= 2.7.0, < 2.8.0
     mccabe >= 0.6.0, < 0.7.0
     enum34; python_version<"3.4"
     typing; python_version<"3.5"
diff --git a/src/flake8/processor.py b/src/flake8/processor.py
index 75b8de7..ad011c3 100644
--- a/src/flake8/processor.py
+++ b/src/flake8/processor.py
@@ -85,6 +85,8 @@ class FileProcessor(object):
         self.indent_level = 0
         #: Number of spaces used for indentation
         self.indent_size = options.indent_size
+        #: String representing the space indentation
+        self.indent_size_str = self.indent_size * " "
         #: Line number in the file
         self.line_number = 0
         #: Current logical line
diff --git a/tests/integration/test_main.py b/tests/integration/test_main.py
index 85afa20..e2f58c5 100644
--- a/tests/integration/test_main.py
+++ b/tests/integration/test_main.py
@@ -252,7 +252,6 @@ t.py:2:6: W292 no newline at end of file
 '''
 
 
-@pytest.mark.xfail(strict=True)  # currently awaiting fix in pycodestyle
 def test_physical_line_file_not_ending_in_newline_trailing_ws(tmpdir, capsys):
     """See https://github.com/PyCQA/pycodestyle/issues/960."""
     t_py_src = 'x = 1   '
@@ -264,7 +263,7 @@ def test_physical_line_file_not_ending_in_newline_trailing_ws(tmpdir, capsys):
     out, err = capsys.readouterr()
     assert out == '''\
 t.py:1:6: W291 trailing whitespace
-t.py:1:10: W292 no newline at end of file
+t.py:1:9: W292 no newline at end of file
 '''
 
 
diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py
index eb76f98..a407b50 100644
--- a/tests/unit/conftest.py
+++ b/tests/unit/conftest.py
@@ -9,6 +9,7 @@ def options_from(**kwargs):
     kwargs.setdefault('hang_closing', True)
     kwargs.setdefault('max_line_length', 79)
     kwargs.setdefault('max_doc_length', None)
+    kwargs.setdefault('indent_size', 4)
     kwargs.setdefault('verbose', False)
     kwargs.setdefault('stdin_display_name', 'stdin')
     kwargs.setdefault('disable_noqa', False)