Fix flake8 errors

Fix exclude rules so we do not run flake8 against code in the build,
.tox, or openstack/common directories since this code is not "ours."

Fix flake8 errors in other code.

Update the config checker script so if there are differences they
are printed to the output. This should help track down false
negatives in the tests.

Change-Id: I9938846943b7f8aab20f02266b870d560c6a2f80
Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
This commit is contained in:
Doug Hellmann 2013-07-02 15:26:10 -04:00
parent afba75f61b
commit 2f1378ebea
8 changed files with 60 additions and 58 deletions

View File

@ -28,7 +28,7 @@ os.environ['DJANGO_SETTINGS_MODULE'] = 'openstack_dashboard.settings'
def write_autodoc_index():
def find_autodoc_modules(module_name, sourcedir):
"""returns a list of modules in the SOURCE directory"""
"""Return a list of modules in the SOURCE directory."""
modlist = []
os.chdir(os.path.join(sourcedir, module_name))
print "SEARCHING %s" % sourcedir
@ -77,7 +77,8 @@ def write_autodoc_index():
if not(os.path.exists(MOD_DIR)):
os.mkdir(MOD_DIR)
for module in find_autodoc_modules(modulename, path):
if any([module.startswith(exclude) for exclude \
if any([module.startswith(exclude)
for exclude
in EXCLUDED_MODULES]):
print "Excluded module %s." % module
continue

View File

@ -44,8 +44,9 @@ from nova.openstack.common import importutils
from nova.openstack.common import log as logging
from nova.openstack.common.notifier import api as notifier_api
# For nova_CONF.compute_manager, used in the nova_notifier module.
from nova import service
# This option is used in the nova_notifier module, so make
# sure it is defined.
config.cfg.CONF.import_opt('compute_manager', 'nova.service')
# HACK(dhellmann): Import this before any other ceilometer code
# because the notifier module messes with the import path to force

View File

@ -2,7 +2,7 @@
TMPFILE=`mktemp`
trap "rm -f ${TMPFILE}" EXIT
tools/conf/generate_sample.sh "${TMPFILE}"
if ! cmp -s "${TMPFILE}" etc/ceilometer/ceilometer.conf.sample
if ! diff "${TMPFILE}" etc/ceilometer/ceilometer.conf.sample
then
echo "E: ceilometer.conf.sample is not up to date, please run tools/conf/generate_sample.sh"
exit 42

View File

@ -104,7 +104,7 @@ def main():
])
remaining_args = cfg.CONF(sys.argv)
utils.monkey_patch()
#utils.monkey_patch()
parser = argparse.ArgumentParser(
description='record or play back notification events',

View File

@ -43,5 +43,5 @@ commands = {posargs}
[flake8]
ignore = H301,H306
builtins = _
exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools,nova_tests
exclude=.venv,.git,.tox,dist,doc,./ceilometer/openstack/common,*lib/python*,*egg,tools,nova_tests,build
show-source = True