From 64ded799076b9e452c3147ad240f85869c39c2cc Mon Sep 17 00:00:00 2001
From: Joe Gordon <jogo@cloudscaling.com>
Date: Wed, 30 Jan 2013 13:26:07 -0800
Subject: import tools/flakes from oslo

Change-Id: Id6d99fe1fd39e8c061f591e9a82058aea9664674
---
 tools/flakes.py | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'tools')

diff --git a/tools/flakes.py b/tools/flakes.py
index f805fd156..7f96116ca 100644
--- a/tools/flakes.py
+++ b/tools/flakes.py
@@ -2,21 +2,14 @@
  wrapper for pyflakes to ignore gettext based warning:
      "undefined name '_'"
 
- From https://bugs.launchpad.net/pyflakes/+bug/844592
+ Synced in from openstack-common
 """
-import __builtin__
-import os
 import sys
 
+import pyflakes.checker
 from pyflakes.scripts import pyflakes
 
 if __name__ == "__main__":
-    names = os.environ.get('PYFLAKES_BUILTINS', '_')
-    names = [x.strip() for x in names.split(',')]
-    for x in names:
-        if not hasattr(__builtin__, x):
-            setattr(__builtin__, x, True)
-
-    del names, os, __builtin__
-
+    orig_builtins = set(pyflakes.checker._MAGIC_GLOBALS)
+    pyflakes.checker._MAGIC_GLOBALS = orig_builtins | set(['_'])
     sys.exit(pyflakes.main())
-- 
cgit