Fix pyflakes-bypass for PyFlakes 0.7

Don't make assumptions about argument types, get the line number from the
message object.

Fixes bug #1171420

Change-Id: Id0b1b254a1561941dea8ab5bb23aea1f936e7f0b

diff --git a/tools/pyflakes-bypass.py b/tools/pyflakes-bypass.py
index 55a776427728cdf09c2628d83fe155a00e49a053..01052896231f32be2dd3bd66c3b7fa0b19584a39 100644 (file)
--- a/tools/pyflakes-bypass.py
+++ b/tools/pyflakes-bypass.py
@@ -3,11 +3,11 @@ from pyflakes.checker import Checker
 
 
 def report_with_bypass(self, messageClass, *args, **kwargs):
-    text_lineno = args[0] - 1
+    message = messageClass(self.filename, *args, **kwargs)
     with open(self.filename, 'r') as code:
-        if code.readlines()[text_lineno].find('pyflakes_bypass') >= 0:
+        if 'pyflakes_bypass' in code.readlines()[message.lineno - 1]:
             return
-    self.messages.append(messageClass(self.filename, *args, **kwargs))
+    self.messages.append(message)
 
 # monkey patch checker to support bypass
 Checker.report = report_with_bypass