summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-02-02 16:30:17 +0000
committerGerrit Code Review <review@openstack.org>2013-02-02 16:30:17 +0000
commit922f81c18bfbfd3ca8a0b5b1edf59723f7d366af (patch)
tree289af3a6d2b0d422c35fc9e1a81fe8aaf16e9865 /tools
parentb633a27a308290ddbe455ea4a0fa931fecefe414 (diff)
parent64ded799076b9e452c3147ad240f85869c39c2cc (diff)
downloadnova-922f81c18bfbfd3ca8a0b5b1edf59723f7d366af.tar.gz
nova-922f81c18bfbfd3ca8a0b5b1edf59723f7d366af.tar.xz
nova-922f81c18bfbfd3ca8a0b5b1edf59723f7d366af.zip
Merge "import tools/flakes from oslo"
Diffstat (limited to 'tools')
-rw-r--r--tools/flakes.py15
1 files changed, 4 insertions, 11 deletions
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())