summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIan Cordasco <graffatcolmingov@gmail.com>2016-08-28 00:58:19 +0000
committerIan Cordasco <graffatcolmingov@gmail.com>2016-08-28 00:58:19 +0000
commitc17043ff3f245e2ead27c6edde3c9f9ddca0e99f (patch)
tree5f57cc508d8df6e33db44899be1f9ea025183543 /src
parenta09c9acaaf9beb16afdfb788b5b8ab4dd65ca4bd (diff)
parent585628875d29f4a46d8adbccc0e1bfa7b3a4a347 (diff)
downloadflake8-c17043ff3f245e2ead27c6edde3c9f9ddca0e99f.tar.gz
Merge branch 'bug/214' into 'master'
Avoid TypeErrors when handling a SyntaxError See merge request !121
Diffstat (limited to 'src')
-rw-r--r--src/flake8/style_guide.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/flake8/style_guide.py b/src/flake8/style_guide.py
index a1ab473..4d8950c 100644
--- a/src/flake8/style_guide.py
+++ b/src/flake8/style_guide.py
@@ -253,7 +253,10 @@ class StyleGuide(object):
int
"""
# NOTE(sigmavirus24): Apparently we're provided with 0-indexed column
- # numbers so we have to offset that here.
+ # numbers so we have to offset that here. Also, if a SyntaxError is
+ # caught, column_number may be None.
+ if not column_number:
+ column_number = 0
error = Error(code, filename, line_number, column_number + 1, text,
physical_line)
error_is_selected = (self.should_report_error(error.code) is