Merge branch 'bug/203'

src/flake8/exceptions.py

@@ -36,17 +36,17 @@ class InvalidSyntax(Flake8Exception):
 
     def __init__(self, *args, **kwargs):
         """Initialize our InvalidSyntax exception."""
-        self.original_exception = kwargs.pop('exception')
+        exception = kwargs.pop('exception', None)
+        self.original_exception = exception
+        self.error_message = str(exception)
         self.error_code = 'E902'
         self.line_number = 1
         self.column_number = 0
-        try:
+        super(InvalidSyntax, self).__init__(
-            self.error_message = self.original_exception.message
+            self.error_message,
-        except AttributeError:
+            *args,
-            # On Python 3, the IOError is an OSError which has a
+            **kwargs
-            # strerror attribute instead of a message attribute
+        )
-            self.error_message = self.original_exception.strerror
-        super(InvalidSyntax, self).__init__(*args, **kwargs)
 
 
 class PluginRequestedUnknownParameters(Flake8Exception):

src/flake8/processor.py

@@ -247,7 +247,7 @@ class FileProcessor(object):
         # course, I'm going to be unsurprised to be proven wrong at a later
         # date.
         except tokenize.TokenError as exc:
-            raise exceptions.InvalidSyntax(exc.message, exception=exc)
+            raise exceptions.InvalidSyntax(exception=exc)
 
     def line_for(self, line_number):
         """Retrieve the physical line at the specified line number."""