Merge lp:~ev/uci-engine/fix-pep8-and-pyflakes into lp:uci-engine

[Evan]

PEP8 and pyflakes fixes.

I fixed some pyflakes and pep8 errors on the flight out to Austin.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:901
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1747/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1747/rebuild

review: Approve (continuous-integration)

[Robert Bruce Park (robru)]

Considering that everything under cupstream2distro/ directory is an abandoned fork of lp:cupstream2distro, I hope you didn't waste too much time on that. It's probably worthwhile to delete that code or at least re-import it from our trunk, because your copy is just rotting away.

[Evan (ev)]

On 25 November 2014 at 20:16, ♫ Robert Bruce Park ♫
<email address hidden> wrote:
> Considering that everything under cupstream2distro/ directory is an abandoned fork of lp:cupstream2distro, I hope you didn't waste too much time on that. It's probably worthwhile to delete that code or at least re-import it from our trunk, because your copy is just rotting away.

I'm not deeply familiar with our cupstream2distro work. That's more a
question for Ursula or Francis. Guys?

Unmerged revisions

901. By Evan on 2014-11-25

Revert pyflakes-the-world change.

900. By Evan on 2014-11-25

Merge with trunk.

899. By Evan on 2014-11-15

Create a couple of exceptions to the pyflakes tests.

898. By Evan on 2014-11-15

Use the exclusion filter for pyflakes tests.

897. By Evan on 2014-11-15

Add a pyflakes check.

896. By Evan on 2014-11-15

Add a rationale for the new style test.

895. By Evan on 2014-11-15

Fix pep8 in time_sorted_tests tests.

894. By Evan on 2014-11-15

Make pep8 an opt-out, rather than opt-in test for python files. Test non-packaged python code.

893. By Evan on 2014-11-15

pyflakes fixes.

892. By Evan on 2014-11-15

pep8 fixes.

=== modified file 'bin/engine_health.py'
--- bin/engine_health.py	2014-07-25 23:53:47 +0000
+++ bin/engine_health.py	2014-11-25 16:38:40 +0000
@@ -59,7 +59,7 @@
     # Health check always expects 'OK' or 'FAILED' in the first line of the
     # result file.
     result_file_contents = open(result_file).readlines()
-    if not 'OK' in result_file_contents[0]:
+    if 'OK' not in result_file_contents[0]:
         # Printing only the first line of the result file because nagios
         # displays limited output on its interface (one line). Concatenating
         # the whole file on a single message would produce a very confusing

=== modified file 'branch-source-builder/bin/check_bsbuilder.py'
--- branch-source-builder/bin/check_bsbuilder.py	2014-10-29 15:06:26 +0000
+++ branch-source-builder/bin/check_bsbuilder.py	2014-11-25 16:38:40 +0000
@@ -158,7 +158,7 @@
         # run `worker.handle_request` in an isolated GPG environment
         # so it has a chance to auto-retrieve missing keys from the
         # keyserver.
-        with gpg.GnupgEnvironment() as gnupg:
+        with gpg.GnupgEnvironment():
             (cb, result) = worker.handle_request(params, log)
     except Exception as exc:
         message = 'BSB raised: {}'.format(exc.message)

=== modified file 'branch-source-builder/cupstream2distro/packageinppa.py'
--- branch-source-builder/cupstream2distro/packageinppa.py	2014-04-16 18:36:03 +0000
+++ branch-source-builder/cupstream2distro/packageinppa.py	2014-11-25 16:38:40 +0000
@@ -179,9 +179,7 @@
 
         # Try to see if all binaries availables for this arch are built, including arch:all on other archs
         status = self.current_status
-        at_least_one_published_binary = False
         for binary in self.source.getPublishedBinaries():
-            at_least_one_published_binary = True
             # all binaries for an arch are published at the same time
             # launchpad is lying, it's telling that archs not in the ppa are built (for arch:all). Even for non supported arch!
             # for instance, we can have the case of self.arch_all_arch (arch:all), built before the others and amd64 will be built for it

=== modified file 'charms/precise/key-secret-subordinate/unit_tests/test_hooks.py'
--- charms/precise/key-secret-subordinate/unit_tests/test_hooks.py	2014-07-22 12:38:30 +0000
+++ charms/precise/key-secret-subordinate/unit_tests/test_hooks.py	2014-11-25 16:38:40 +0000
@@ -113,7 +113,7 @@
     def test_juju_info_joined(self):
         # Keys are placed immediatelly when the subordinate charm is bound.
         os.makedirs(self.service_dir)
-        self.config.return_value['ssh-private-key'] =  base64.b64encode(
+        self.config.return_value['ssh-private-key'] = base64.b64encode(
             'secret!')
 
         hooks.hooks.execute(['hooks/juju-info-relation-joined'])

=== modified file 'charms/precise/system-image-server/hooks/hooks.py'
--- charms/precise/system-image-server/hooks/hooks.py	2014-10-14 09:04:09 +0000
+++ charms/precise/system-image-server/hooks/hooks.py	2014-11-25 16:38:40 +0000
@@ -16,11 +16,6 @@
     return os.path.join(charmconfig['install_root'], unit)
 
 
-def _install_from_tarball(charmconfig, upgrade):
-    #Do we need this?
-    pass
-
-
 def _install_from_bzr(charmconfig, upgrade):
     log('grabbing service from bzr...', 'INFO')
     sdir = _service_dir(charmconfig)
@@ -77,16 +72,17 @@
 
 def _generate_keys(charmconfig):
     log('generating keys...', 'INFO')
-    #haveged is just an entropy generator
+    # haveged is just an entropy generator
     subprocess.check_output(['haveged'])
     srvdir = _service_dir(charmconfig)
-    #the system-image tools unfortunately really want to run from this dir
+    # the system-image tools unfortunately really want to run from this dir
     os.chdir(srvdir)
     out = subprocess.check_output(['{}/tests/generate-keys'.format(srvdir)])
     log(out, 'INFO')
-    #copy the keys we just generated into the proper location
+    # copy the keys we just generated into the proper location
     shutil.rmtree('{}/secret/gpg/keys/'.format(srvdir))
-    shutil.copytree('{}/tests/keys'.format(srvdir), '{}/secret/gpg/keys/'.format(srvdir))
+    dest = '{}/secret/gpg/keys/'.format(srvdir)
+    shutil.copytree('{}/tests/keys'.format(srvdir), dest)
     subprocess.check_output(['{}/bin/generate-keyrings'.format(srvdir)])
     log(out, 'INFO')
 
@@ -99,11 +95,7 @@
     charmhelpers.fetch.configure_sources(update=True)
     charmhelpers.fetch.apt_install(pkgs)
 
-    if charmconfig.get('vcs') == 'tarball':
-        _install_from_tarball(charmconfig, upgrade)
-    else:
-        _install_from_bzr(charmconfig, upgrade)
-
+    _install_from_bzr(charmconfig, upgrade)
     _write_system_image_config(charmconfig)
     _generate_keys(charmconfig)
     _create_stable_channel(charmconfig)

=== modified file 'charms/precise/webui/unit_tests/test_hooks.py'
--- charms/precise/webui/unit_tests/test_hooks.py	2014-10-08 15:37:26 +0000
+++ charms/precise/webui/unit_tests/test_hooks.py	2014-11-25 16:38:40 +0000
@@ -119,4 +119,3 @@
 
         with hooks.status_urls() as data:
             self.assertEqual({}, data)
-

=== modified file 'cupstream2distro/tests/unit/test_resignpackage.py'
--- cupstream2distro/tests/unit/test_resignpackage.py	2014-06-17 12:25:23 +0000
+++ cupstream2distro/tests/unit/test_resignpackage.py	2014-11-25 16:38:40 +0000
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from . import BaseUnitTestCase, BaseUnitTestCaseWithErrors
+from . import BaseUnitTestCase
 
 import subprocess
 import os

=== modified file 'docs/conf.py'
--- docs/conf.py	2014-10-07 10:04:01 +0000
+++ docs/conf.py	2014-11-25 16:38:40 +0000
@@ -3,28 +3,17 @@
 # Ubuntu CI Engine documentation build configuration file, created by
 # sphinx-quickstart on Thu Nov 14 11:38:40 2013.
 #
-# This file is execfile()d with the current directory set to its containing dir.
+# This file is execfile()d with the current directory set to its containing
+# dir.
 #
 # Note that not all possible configuration values are present in this
 # autogenerated file.
 #
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-import sys, os
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
-
-# -- General configuration -----------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be extensions
-# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+# All configuration values have a default; values that are commented out serve
+# to show the default.
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [
     'sphinx.ext.autodoc',
 ]
@@ -35,9 +24,6 @@
 # The suffix of source filenames.
 source_suffix = '.rst'
 
-# The encoding of source files.
-#source_encoding = 'utf-8-sig'
-
 # The master toctree document.
 master_doc = 'index'
 
@@ -45,54 +31,15 @@
 project = u'Ubuntu CI Engine'
 copyright = u'2013-2014, Canonical Ltd.'
 
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-#version = '0.0'
-# The full version, including alpha/beta/rc tags.
-#release = '0.0'
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#language = None
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
-
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 exclude_patterns = ['_build']
 
-# The reST default role (used for this markup: `text`) to use for all documents.
-#default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
 
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
-
-# -- Options for HTML output ---------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
+# The theme to use for HTML and HTML Help pages.  See the documentation for a
+# list of builtin themes.
 try:
     import sphinx_bootstrap_theme
 except ImportError:
@@ -110,150 +57,32 @@
         'globaltoc_depth': -1,
     }
 
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#html_theme_options = {}
-
-# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
-
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static']
 
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_domain_indices = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'UbuntuCIEnginedoc'
 
-
-# -- Options for LaTeX output --------------------------------------------------
-
-latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
-
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
-
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
+# Grouping the document tree into LaTeX files. List of tuples (source start
+# file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'UbuntuCIEngine.tex', u'Ubuntu CI Engine Documentation',
-   u'Canonical CI Engineering Team', 'manual'),
+    ('index', 'UbuntuCIEngine.tex', u'Ubuntu CI Engine Documentation',
+     u'Canonical CI Engineering Team', 'manual'),
 ]
 
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
-# -- Options for manual page output --------------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
+# One entry per manual page. List of tuples (source start file, name,
+# description, authors, manual section).
 man_pages = [
     ('index', 'ubuntuciengine', u'Ubuntu CI Engine Documentation',
      [u'Canonical CI Engineering Team'], 1)
 ]
 
-# If true, show URL addresses after external links.
-#man_show_urls = False
-
-
-# -- Options for Texinfo output ------------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
+# Grouping the document tree into Texinfo files. List of tuples (source start
+# file, target name, title, author, dir menu entry, description, category)
 texinfo_documents = [
-  ('index', 'UbuntuCIEngine', u'Ubuntu CI Engine Documentation',
-   u'Canonical CI Engineering Team', 'UbuntuCIEngine', 'One line description of project.',
-   'Miscellaneous'),
+    ('index', 'UbuntuCIEngine', u'Ubuntu CI Engine Documentation',
+     u'Canonical CI Engineering Team', 'UbuntuCIEngine',
+     'One line description of project.', 'Miscellaneous'),
 ]
-
-# Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
-
-# If false, no module index is generated.
-#texinfo_domain_indices = True
-
-# How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'

=== modified file 'image-builder/imagebuilder/run_worker.py'
--- image-builder/imagebuilder/run_worker.py	2014-10-29 16:43:39 +0000
+++ image-builder/imagebuilder/run_worker.py	2014-11-25 16:38:40 +0000
@@ -42,7 +42,7 @@
             log.info(msg)
             amqp_utils.progress_update(trigger, {'message': msg})
 
-        #Check API version
+        # Check API version
         api = params.get('api_version')
         if api == '20140721':
             image_id = get_image(image, status_cb)

=== modified file 'lander/setup.py'
--- lander/setup.py	2014-10-15 07:10:31 +0000
+++ lander/setup.py	2014-11-25 16:38:40 +0000
@@ -18,7 +18,6 @@
 import sys
 
 
-
 HERE = os.path.abspath(os.path.dirname(__file__))
 # get ci_utils.setuptools on the path
 sys.path.append(os.path.join(HERE, '..', 'ci-utils'))

=== modified file 'nf-stats-service/nfss/__init__.py'
--- nf-stats-service/nfss/__init__.py	2014-08-26 14:49:08 +0000
+++ nf-stats-service/nfss/__init__.py	2014-11-25 16:38:40 +0000
@@ -36,6 +36,8 @@
     config.scan()
     try:
         import pyramid_debugtoolbar
+        # Make pyflakes happy with a no-op statement.
+        pyramid_debugtoolbar
         config.include('pyramid_debugtoolbar')
         config.registry.settings['debugtoolbar.hosts'].append('10.0.0.0/16')
     except ImportError:

=== modified file 'ticket_system/project/tests.py'
--- ticket_system/project/tests.py	2014-02-15 12:06:40 +0000
+++ ticket_system/project/tests.py	2014-11-25 16:38:40 +0000
@@ -173,7 +173,7 @@
 class TestPep8(styles.TestPep8):
 
     packages = [project]
-    exclude = ['migrations/']
+    exclude = ['migrations']
 
 
 class TestPyflakes(styles.TestPyflakes):

=== modified file 'ticket_system/ticket/tests/test_style.py'
--- ticket_system/ticket/tests/test_style.py	2014-10-07 10:04:01 +0000
+++ ticket_system/ticket/tests/test_style.py	2014-11-25 16:38:40 +0000
@@ -26,7 +26,7 @@
 class TestPep8(styles.TestPep8):
 
     packages = [ticket]
-    exclude = ['migrations/']
+    exclude = ['migrations']
 
 
 class TestPyflakes(styles.TestPyflakes):

=== modified file 'ticket_system/ticket/tests/test_user_info.py'
--- ticket_system/ticket/tests/test_user_info.py	2014-11-03 20:50:01 +0000
+++ ticket_system/ticket/tests/test_user_info.py	2014-11-25 16:38:40 +0000
@@ -85,7 +85,7 @@
         self.assertEqual('', self._get_current_username())
 
     def test_logout_works(self):
-        #'logout' inconditionally logs the user out.
+        # 'logout' inconditionally logs the user out.
         self.assertLoggedIn('test')
 
         # By default the 'logout' page redirects to the (webui) site root
@@ -97,7 +97,7 @@
         self.assertNotLoggedIn()
 
     def test_logout_supports_next(self):
-        #'logout' can optionally redirect users to another page, normally
+        # 'logout' can optionally redirect users to another page, normally
         # where they came from, via 'next' GET parameter.
         self.assertLoggedIn('test')
 

=== modified file 'ticket_system/ticket_system/settings.py'
--- ticket_system/ticket_system/settings.py	2014-10-07 10:04:01 +0000
+++ ticket_system/ticket_system/settings.py	2014-11-25 16:38:40 +0000
@@ -40,8 +40,8 @@
         with open(path) as f:
             config = yaml.safe_load(f.read())
     except:
-        print('Unable to use unit_config(%s), defaulting values' % path,
-             file=sys.stderr)
+        msg = 'Unable to use unit_config(%s), defaulting values' % path
+        print(msg, file=sys.stderr)
     return config
 _cfg = _unit_config()
 
@@ -120,7 +120,6 @@
 STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-    #'django.contrib.staticfiles.finders.DefaultStorageFinder',
 )
 
 # Make this unique, and don't share it with anybody.
@@ -170,7 +169,6 @@
 )
 
 LOCAL_APPS = (
-    #'people',
     'project',
     'ticket',
 )