Merge "Fix flake8 errors"

doc/source/conf.py

@@ -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
@@ -300,14 +301,14 @@ htmlhelp_basename = 'Ceilometerdoc'
 # -- Options for LaTeX output -------------------------------------------------
 
 latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
+    # The paper size ('letterpaper' or 'a4paper').
+    #'papersize': 'letterpaper',
 
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
+    # The font size ('10pt', '11pt' or '12pt').
+    #'pointsize': '10pt',
 
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
+    # Additional stuff for the LaTeX preamble.
+    #'preamble': '',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples

nova_tests/test_notifier.py

@@ -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

tools/conf/check_uptodate.sh

@@ -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

tools/notificationclient.py

@@ -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',

tools/release-bugs.py

@@ -36,7 +36,7 @@ PRE_RELEASE_STATUS = "Fix Released"
 RELEASE_PROMPT = (
     "Found {bug_count} '{pre_release_status}' bugs for milestone "
     "{milestone_title}. Mark them 'Fix Released'? [y/n]: "
-    )
+)
 
 
 def main():

tools/show_data.py

@@ -107,7 +107,7 @@ COMMANDS = {
     'resources': show_resources,
     'total_resources': show_total_resources,
     'raw': show_raw,
-    }
+}
 
 
 def main(argv):

tox.ini

@@ -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