From: Zane Bitter <zbitter@redhat.com>
Date: Mon, 22 Apr 2013 16:24:56 +0000 (+0200)
Subject: Fix pyflakes-bypass for PyFlakes 0.7
X-Git-Tag: 2014.1~704^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=78f0da46f21f2dcba2c69e782ad61be061012835;p=openstack-build%2Fheat-build.git

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 55a77642..01052896 100644
--- 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