summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJoe Gordon <jogo@cloudscaling.com>2013-01-30 13:44:48 -0800
committerJoe Gordon <jogo@cloudscaling.com>2013-01-30 13:44:48 -0800
commitcdfbbc6f1d4c50594947a0b9339cffffa245f7c5 (patch)
tree8c46d34458d1b8dab3de8af6efb6231177aa1bd7 /tools
parentd3f28ed56c218ed7275c66eb647e581ce1654083 (diff)
downloadkeystone-cdfbbc6f1d4c50594947a0b9339cffffa245f7c5.tar.gz
keystone-cdfbbc6f1d4c50594947a0b9339cffffa245f7c5.tar.xz
keystone-cdfbbc6f1d4c50594947a0b9339cffffa245f7c5.zip
import tools/flakes from oslo
Change-Id: I4b73fa1eb045517bb25932d1a85c7fab8186d251
Diffstat (limited to 'tools')
-rw-r--r--tools/flakes.py19
1 files changed, 6 insertions, 13 deletions
diff --git a/tools/flakes.py b/tools/flakes.py
index 4b93abc2..7f96116c 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
-from pyflakes.scripts.pyflakes import main
+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__
-
- sys.exit(main())
+ orig_builtins = set(pyflakes.checker._MAGIC_GLOBALS)
+ pyflakes.checker._MAGIC_GLOBALS = orig_builtins | set(['_'])
+ sys.exit(pyflakes.main())