openstack/aodh
Code Issues Proposed changes

Merge "Fix flake8 errors"

Browse Source
This commit is contained in:
Jenkins 2013-07-04 23:54:03 +00:00 committed by Gerrit Code Review
commit 539d7e5a41
8 changed files with 60 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/source/conf.py
View File

@ -28,7 +28,7 @@ os.environ['DJANGO_SETTINGS_MODULE'] = 'openstack_dashboard.settings'
def write_autodoc_index(): def write_autodoc_index():
def find_autodoc_modules(module_name, sourcedir): 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 = [] modlist = []
os.chdir(os.path.join(sourcedir, module_name)) os.chdir(os.path.join(sourcedir, module_name))
print "SEARCHING %s" % sourcedir print "SEARCHING %s" % sourcedir
@ -77,7 +77,8 @@ def write_autodoc_index():
if not(os.path.exists(MOD_DIR)): if not(os.path.exists(MOD_DIR)):
os.mkdir(MOD_DIR) os.mkdir(MOD_DIR)
for module in find_autodoc_modules(modulename, path): 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]): in EXCLUDED_MODULES]):
print "Excluded module %s." % module print "Excluded module %s." % module
continue continue

5
nova_tests/test_notifier.py
View File

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

2
tools/conf/check_uptodate.sh
View File

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

2
tools/notificationclient.py
View File

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

2
tox.ini
View File

@ -43,5 +43,5 @@ commands = {posargs}
[flake8] [flake8]
ignore = H301,H306 ignore = H301,H306
builtins = _ 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 show-source = True