From eeb6f8c77f199028f15bd094a48bb0ceb490b9bf Mon Sep 17 00:00:00 2001 From: Joe Gordon Date: Wed, 30 Jan 2013 13:33:31 -0800 Subject: [PATCH] import tools/flakes from oslo Change-Id: Iac52a0cc48de9f29a91545e319c144e3f935799d --- openstack-common.conf | 2 +- tools/flakes.py | 19 ++++++------------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/openstack-common.conf b/openstack-common.conf index aba84d898..d330537e0 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -1,7 +1,7 @@ [DEFAULT] # The list of modules to copy from openstack-common -modules=cfg,exception,excutils,gettextutils,importutils,iniparser,jsonutils,local,rpc,timeutils,log,setup,notifier,context,network_utils,policy,uuidutils,lockutils,fileutils,gettextutils,scheduler,scheduler.filters,scheduler.weights,install_venv_common +modules=cfg,exception,excutils,gettextutils,importutils,iniparser,jsonutils,local,rpc,timeutils,log,setup,notifier,context,network_utils,policy,uuidutils,lockutils,fileutils,gettextutils,scheduler,scheduler.filters,scheduler.weights,install_venv_common,flakes # The base module to hold the copy of openstack.common base=cinder diff --git a/tools/flakes.py b/tools/flakes.py index 4b93abc21..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 -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()) -- 2.45.2