pre-commit/flake8
1
0
Fork 0
mirror of https://github.com/PyCQA/flake8.git synced 2026-04-09 22:34:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Avoid calling rstrip on None

Browse source 
When we receive a SyntaxError, it is not guaranteed to have a token that
includes the physical line causing the issue. If it does not, we now
will avoid trying to determine the number of rows and columns that are
actually there and default to what the error tells us.

Closes #279
This commit is contained in:
Ian Cordasco 2017-01-27 15:22:49 -06:00
parent 9145674cf2
commit 7ca05a9ca1
No known key found for this signature in database
GPG key ID: 656D3395E4A9791A
1 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/flake8/checker.py
View file

@ -443,19 +443,24 @@ class FileChecker(object):
# numbers. We need to decrement the column number by 1 at # numbers. We need to decrement the column number by 1 at
# least. # least.
column_offset = 1 column_offset = 1
row_offset = 0
# See also: https://gitlab.com/pycqa/flake8/issues/237 # See also: https://gitlab.com/pycqa/flake8/issues/237
physical_line = token[-1] physical_line = token[-1]
# NOTE(sigmavirus24): SyntaxErrors also don't exactly have a # NOTE(sigmavirus24): Not all "tokens" have a string as the last
# "physical" line so much as what was accumulated by the point # argument. In this event, let's skip trying to find the correct
# tokenizing failed. # column and row values.
# See also: https://gitlab.com/pycqa/flake8/issues/237 if physical_line is not None:
lines = physical_line.rstrip('\n').split('\n') # NOTE(sigmavirus24): SyntaxErrors also don't exactly have a
row_offset = len(lines) - 1 # "physical" line so much as what was accumulated by the point
logical_line = lines[0] # tokenizing failed.
logical_line_length = len(logical_line) # See also: https://gitlab.com/pycqa/flake8/issues/237
if column > logical_line_length: lines = physical_line.rstrip('\n').split('\n')
column = logical_line_length row_offset = len(lines) - 1
logical_line = lines[0]
logical_line_length = len(logical_line)
if column > logical_line_length:
column = logical_line_length
row -= row_offset row -= row_offset
column -= column_offset column -= column_offset
return row, column return row, column