Merge ~cjwatson/launchpad:flake8-line-length into launchpad:master

[Colin Watson]

Fix/ignore flake8 line length errors

[Cristian Gonzalez (cristiangsp)]

Looks good!

review: Approve

diff --git a/doc/conf.py b/doc/conf.py
index 212dd6b..c4a73e4 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -3,7 +3,8 @@
 # Launchpad documentation build configuration file, created by
 # sphinx-quickstart on Thu Feb  3 16:06:09 2011.
 #
-# 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.
@@ -16,13 +17,13 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #sys.path.insert(0, os.path.abspath('.'))
 
-# -- General configuration -----------------------------------------------------
+# -- 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.
+# 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', 'sphinx.ext.doctest', 'sphinx.ext.todo']
 
 # Add any paths that contain templates here, relative to this directory.
@@ -64,7 +65,8 @@ release = 'dev'
 # 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.
+# 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.
@@ -85,7 +87,7 @@ pygments_style = 'sphinx'
 #modindex_common_prefix = []
 
 
-# -- Options for HTML output ---------------------------------------------------
+# -- Options for HTML output --------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
@@ -165,7 +167,7 @@ html_static_path = ['_static']
 htmlhelp_basename = 'Launchpaddoc'
 
 
-# -- Options for LaTeX output --------------------------------------------------
+# -- Options for LaTeX output -------------------------------------------------
 
 # The paper size ('letter' or 'a4').
 #latex_paper_size = 'letter'
@@ -174,7 +176,8 @@ htmlhelp_basename = 'Launchpaddoc'
 #latex_font_size = '10pt'
 
 # Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
+# (source start file, target name, title, author,
+#  documentclass [howto/manual]).
 latex_documents = [
   ('index', 'Launchpad.tex', u'Launchpad Documentation',
    u'The Launchpad Developers', 'manual'),
@@ -204,7 +207,7 @@ latex_documents = [
 #latex_domain_indices = True
 
 
-# -- Options for manual page output --------------------------------------------
+# -- Options for manual page output -------------------------------------------
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
diff --git a/lib/lp/app/validators/email.py b/lib/lp/app/validators/email.py
index ce959fc..04d02dc 100644
--- a/lib/lp/app/validators/email.py
+++ b/lib/lp/app/validators/email.py
@@ -79,6 +79,7 @@ def email_validator(emailaddr):
     >>> email_validator('[e-mail]')
     True
     >>> email_validator('not-valid')
+    ... # noqa
     ... # doctest: +IGNORE_EXCEPTION_MODULE_IN_PYTHON2
     Traceback (most recent call last):
     ...
diff --git a/lib/lp/app/validators/tests/test_validation.py b/lib/lp/app/validators/tests/test_validation.py
index 7c9c8b5..3cd87d9 100644
--- a/lib/lp/app/validators/tests/test_validation.py
+++ b/lib/lp/app/validators/tests/test_validation.py
@@ -38,4 +38,5 @@ class TestOCIBranchValidator(TestCase):
         self.assertTrue(validate_oci_branch_name('refs/tags/v2-1.0-20.04'))
 
     def test_validate_oci_branch_name_heads_and_tags(self):
-        self.assertFalse(validate_oci_branch_name("refs/heads/refs/tags/v1.0-20.04"))
+        self.assertFalse(validate_oci_branch_name(
+            "refs/heads/refs/tags/v1.0-20.04"))
diff --git a/lib/lp/app/widgets/date.py b/lib/lp/app/widgets/date.py
index 85d0756..c24da8f 100644
--- a/lib/lp/app/widgets/date.py
+++ b/lib/lp/app/widgets/date.py
@@ -85,6 +85,7 @@ class DateTimeWidget(TextWidget):
       >>> widget.from_date = datetime(2006, 5, 23,
       ...                             tzinfo=pytz.timezone('UTC'))
       >>> print(widget.getInputValue())
+      ... # noqa
       ... # doctest: +NORMALIZE_WHITESPACE,+ELLIPSIS
       ... # doctest: +IGNORE_EXCEPTION_MODULE_IN_PYTHON2
       Traceback (most recent call last):
@@ -103,6 +104,7 @@ class DateTimeWidget(TextWidget):
       >>> widget.to_date = datetime(2008, 1, 26,
       ...                           tzinfo=pytz.timezone('UTC'))
       >>> print(widget.getInputValue())
+      ... # noqa
       ... # doctest: +NORMALIZE_WHITESPACE,+ELLIPSIS
       ... # doctest: +IGNORE_EXCEPTION_MODULE_IN_PYTHON2
       Traceback (most recent call last):
diff --git a/lib/lp/archivepublisher/customupload.py b/lib/lp/archivepublisher/customupload.py
index 0c6a2c9..741211a 100644
--- a/lib/lp/archivepublisher/customupload.py
+++ b/lib/lp/archivepublisher/customupload.py
@@ -27,7 +27,9 @@ from lp.archivepublisher.debversion import (
     Version as make_version,
     VersionError,
     )
-from lp.archivepublisher.interfaces.archivegpgsigningkey import ISignableArchive
+from lp.archivepublisher.interfaces.archivegpgsigningkey import (
+    ISignableArchive,
+    )
 from lp.services.librarian.utils import copy_and_close
 from lp.soyuz.interfaces.queue import (
     CustomUploadError,
diff --git a/lib/lp/archivepublisher/tests/test_signing.py b/lib/lp/archivepublisher/tests/test_signing.py
index 8e01ca1..e57ae72 100644
--- a/lib/lp/archivepublisher/tests/test_signing.py
+++ b/lib/lp/archivepublisher/tests/test_signing.py
@@ -1770,7 +1770,8 @@ class TestSigningUploadWithSigningService(TestSigningHelpers):
                 '1.0/empty.sipl.sig', '1.0/control/sipl.x509',
                 '1.0/empty.fit.signed', '1.0/control/fit.crt',
                 '1.0/empty.cv2-kernel.sig', '1.0/control/cv2-kernel.pub',
-                '1.0/empty.android-kernel.sig', '1.0/control/android-kernel.x509',
+                '1.0/empty.android-kernel.sig',
+                '1.0/control/android-kernel.x509',
             ], tarball.getnames())
         self.assertEqual(0, self.signing_service_client.generate.call_count)
         keys = self.signing_keys
diff --git a/lib/lp/archiveuploader/tests/test_tagfiles.py b/lib/lp/archiveuploader/tests/test_tagfiles.py
index f5bf552..5c541d9 100755
--- a/lib/lp/archiveuploader/tests/test_tagfiles.py
+++ b/lib/lp/archiveuploader/tests/test_tagfiles.py
@@ -119,9 +119,9 @@ class TestTagFileDebianPolicyCompat(unittest.TestCase):
         Note: in the past, our parse_tagfile function left the leading
         '\n' in the parsed value, whereas it should not have.
 
-        For an example,
-        see http://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Files
-        """
+        For an example, see
+        https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-files
+        """  # noqa: E501
 
         expected_bytes = (
             b'f26bb9b29b1108e53139da3584a4dc92 1511 test75874_0.1.tar.gz\n '
@@ -142,8 +142,8 @@ class TestTagFileDebianPolicyCompat(unittest.TestCase):
         """Apt-pkg preserves the blank-line indicator and does not strip
         leading spaces.
 
-        See http://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Description
-        """
+        See https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-description
+        """  # noqa: E501
         expected_bytes = (
             b"Here's the single-line synopsis.\n"
             b" Then there is the extended description which can\n"
diff --git a/lib/lp/code/mail/tests/test_codehandler.py b/lib/lp/code/mail/tests/test_codehandler.py
index 47dc486..55fd4a5 100644
--- a/lib/lp/code/mail/tests/test_codehandler.py
+++ b/lib/lp/code/mail/tests/test_codehandler.py
@@ -229,7 +229,8 @@ class TestCodeHandler(TestCaseWithFactory):
         Error message:
 
         The 'review' command expects any of the following arguments:
-        abstain, approve, disapprove, needs-fixing, needs-info, needs-resubmitting
+        abstain, approve, disapprove, needs-fixing, needs-info,
+        needs-resubmitting
 
         For example:
 
diff --git a/lib/lp/code/mail/tests/test_codeimport.py b/lib/lp/code/mail/tests/test_codeimport.py
index b37f538..03411f5 100644
--- a/lib/lp/code/mail/tests/test_codeimport.py
+++ b/lib/lp/code/mail/tests/test_codeimport.py
@@ -150,7 +150,8 @@ class TestNewCodeImports(TestCaseWithFactory):
         self.assertEqual(
             'A new git code import has been requested '
             'by Eric:\n'
-            '    http://code.launchpad.test/~eric/foobuntu/manic/fooix/master\n'
+            '    http://code.launchpad.test/'
+            '~eric/foobuntu/manic/fooix/master\n'
             'from\n'
             '    git://git.example.com/fooix.git\n'
             '\n'
diff --git a/lib/lp/code/model/tests/test_branch.py b/lib/lp/code/model/tests/test_branch.py
index 1649dc9..d69c650 100644
--- a/lib/lp/code/model/tests/test_branch.py
+++ b/lib/lp/code/model/tests/test_branch.py
@@ -3273,8 +3273,8 @@ class TestGetBzrBranch(TestCaseWithFactory):
         self.useBzrBranches(direct_database=True)
 
     def test_simple(self):
-        # open_only_scheme returns the underlying bzr branch of a database branch in
-        # the simple, unstacked, case.
+        # open_only_scheme returns the underlying bzr branch of a database
+        # branch in the simple, unstacked, case.
         db_branch, tree = self.create_branch_and_tree()
         # XXX: AaronBentley 2010-08-06 bug=614404: a bzr username is
         # required to generate the revision-id.
@@ -3335,7 +3335,8 @@ class TestBranchGetBlob(TestCaseWithFactory):
             [((branch.id, 'some-file-id'), {'rev': 'scanned-id'})],
             hosting_fixture.getBlob.calls)
         key = (
-            'bazaar.launchpad.test:bzr-file-list:%s:scanned-id:src' % branch.id)
+            'bazaar.launchpad.test:bzr-file-list:%s:scanned-id:src' %
+            branch.id)
         self.assertEqual(
             json.dumps({'README.txt': 'some-file-id'}),
             getUtility(IMemcacheClient).get(key.encode('UTF-8')))
diff --git a/lib/lp/oci/tests/test_ocirecipe.py b/lib/lp/oci/tests/test_ocirecipe.py
index 95e30a8..c3bb8f8 100644
--- a/lib/lp/oci/tests/test_ocirecipe.py
+++ b/lib/lp/oci/tests/test_ocirecipe.py
@@ -680,8 +680,8 @@ class TestOCIRecipe(OCIConfigHelperMixin, TestCaseWithFactory):
             oci_project=oci_project, registrant=owner)
 
         self.assertRaises(
-            OCIProjectRecipeInvalid, another_oci_project.setOfficialRecipeStatus,
-            recipe, True)
+            OCIProjectRecipeInvalid,
+            another_oci_project.setOfficialRecipeStatus, recipe, True)
 
     def test_permission_check_on_setOfficialRecipe(self):
         distro = self.factory.makeDistribution()
diff --git a/lib/lp/registry/model/distributionsourcepackage.py b/lib/lp/registry/model/distributionsourcepackage.py
index 863ae85..e7611be 100644
--- a/lib/lp/registry/model/distributionsourcepackage.py
+++ b/lib/lp/registry/model/distributionsourcepackage.py
@@ -263,7 +263,8 @@ class DistributionSourcePackage(BugTargetBase,
                 self.distribution.all_distro_archive_ids),
             SourcePackagePublishingHistory.sourcepackagerelease ==
                 SourcePackageRelease.id,
-            SourcePackagePublishingHistory.sourcepackagename == self.sourcepackagename,
+            SourcePackagePublishingHistory.sourcepackagename ==
+                self.sourcepackagename,
             SourcePackageRelease.sourcepackagename == self.sourcepackagename,
             Cast(SourcePackageRelease.version, "text") ==
                 six.ensure_text(version),
diff --git a/lib/lp/registry/tests/test_prf_walker.py b/lib/lp/registry/tests/test_prf_walker.py
index 9a1f32d..cf82294 100644
--- a/lib/lp/registry/tests/test_prf_walker.py
+++ b/lib/lp/registry/tests/test_prf_walker.py
@@ -282,7 +282,7 @@ class HTTPWalker_ListDir(TestCase):
 
 <address>Apache/2.2.3 (Unix) Server at <a href="mailto:[e-mail]">ftp.acc.umu.se</a> Port 80</address>
 </body></html>
-        '''
+        '''  # noqa: E501
         listing_url = 'http://ftp.gnome.org/pub/GNOME/sources/gnome-gpg/0.5/'
         responses.add('GET', listing_url, body=content)
         expected_filenames = [
@@ -323,7 +323,7 @@ FTP Directory: <A HREF="/">ftp://ftp.gnome.org</A>/<A HREF="/pub/">pub</A>/<A HR
 <ADDRESS>
 Generated Wed, 06 Sep 2006 11:04:02 GMT by squid (squid/2.5.STABLE12)
 </ADDRESS></BODY></HTML>
-        '''
+        '''  # noqa: E501
         listing_url = 'ftp://ftp.gnome.org/pub/GNOME/sources/gnome-gpg/0.5/'
         responses.add('GET', listing_url, body=content)
         walker = HTTPWalker(listing_url, logging.getLogger())
diff --git a/lib/lp/services/librarianserver/testing/server.py b/lib/lp/services/librarianserver/testing/server.py
index 20bfdfd..535d504 100644
--- a/lib/lp/services/librarianserver/testing/server.py
+++ b/lib/lp/services/librarianserver/testing/server.py
@@ -161,20 +161,29 @@ class LibrarianServerFixture(TacTestSetup):
             return
         chunks = self.getLogChunks()
         # A typical startup: upload, download, restricted up, restricted down.
-        #2017-12-09 06:33:13+0530 [-] Loading /home/ubuntu/launchpad/lp-branches/devel/daemons/librarian.tac...
-        #2017-12-09 06:33:19+0530 [-] Loaded.
-        #2017-12-09 06:33:19+0530 [-] twistd 16.5.0 (/home/ubuntu/launchpad/lp-branches/devel/env/bin/python2.7 2.7.12) starting up.
-        #2017-12-09 06:33:19+0530 [-] reactor class: twisted.internet.epollreactor.EPollReactor.
-        #2017-12-09 06:33:19+0530 [-] FileUploadFactory starting on 39851
-        #2017-12-09 06:33:19+0530 [-] Starting factory <lp.services.librarianserver.libraryprotocol.FileUploadFactory instance at 0xf0ef80ac>
-        #2017-12-09 06:33:19+0530 [-] Site starting on 45355
-        #2017-12-09 06:33:19+0530 [-] Starting factory <twisted.web.server.Site instance at 0xf0ef848c>
-        #2017-12-09 06:33:19+0530 [-] FileUploadFactory starting on 42150
-        #2017-12-09 06:33:19+0530 [-] Starting factory <lp.services.librarianserver.libraryprotocol.FileUploadFactory instance at 0xf0ef856c>
-        #2017-12-09 06:33:19+0530 [-] Site starting on 37341
-        #2017-12-09 06:33:19+0530 [-] Starting factory <twisted.web.server.Site instance at 0xf0ef85ec>
-        #2017-12-09 06:33:19+0530 [-] Not using upstream librarian
-        #2017-12-09 06:33:19+0530 [-] daemon ready!
+        # (Line-wrapped to pacify flake8.)
+        # 2017-12-09 06:33:13+0530 [-] Loading .../daemons/librarian.tac...
+        # 2017-12-09 06:33:19+0530 [-] Loaded.
+        # 2017-12-09 06:33:19+0530 [-] twistd 16.5.0
+        #   (.../env/bin/python2.7 2.7.12) starting up.
+        # 2017-12-09 06:33:19+0530 [-] reactor class:
+        #   twisted.internet.epollreactor.EPollReactor.
+        # 2017-12-09 06:33:19+0530 [-] FileUploadFactory starting on 39851
+        # 2017-12-09 06:33:19+0530 [-] Starting factory
+        #   <lp.services.librarianserver.libraryprotocol.FileUploadFactory
+        #   instance at 0xf0ef80ac>
+        # 2017-12-09 06:33:19+0530 [-] Site starting on 45355
+        # 2017-12-09 06:33:19+0530 [-] Starting factory
+        #   <twisted.web.server.Site instance at 0xf0ef848c>
+        # 2017-12-09 06:33:19+0530 [-] FileUploadFactory starting on 42150
+        # 2017-12-09 06:33:19+0530 [-] Starting factory
+        #   <lp.services.librarianserver.libraryprotocol.FileUploadFactory
+        #   instance at 0xf0ef856c>
+        # 2017-12-09 06:33:19+0530 [-] Site starting on 37341
+        # 2017-12-09 06:33:19+0530 [-] Starting factory
+        #   <twisted.web.server.Site instance at 0xf0ef85ec>
+        # 2017-12-09 06:33:19+0530 [-] Not using upstream librarian
+        # 2017-12-09 06:33:19+0530 [-] daemon ready!
         self.upload_port = int(chunks[4].split()[-1])
         self.download_port = int(chunks[6].split()[-1])
         self.restricted_upload_port = int(chunks[8].split()[-1])
diff --git a/lib/lp/soyuz/browser/archivesubscription.py b/lib/lp/soyuz/browser/archivesubscription.py
index f05a506..e78b7cd 100644
--- a/lib/lp/soyuz/browser/archivesubscription.py
+++ b/lib/lp/soyuz/browser/archivesubscription.py
@@ -129,7 +129,8 @@ class ArchiveSubscribersView(LaunchpadFormView):
 
     schema = IArchiveSubscriberUI
     field_names = ['subscriber', 'date_expires', 'description']
-    custom_widget_description = CustomWidgetFactory(TextWidget, displayWidth=40)
+    custom_widget_description = CustomWidgetFactory(
+        TextWidget, displayWidth=40)
     custom_widget_date_expires = DateWidget
     custom_widget_subscriber = CustomWidgetFactory(
         PersonPickerWidget, header="Select the subscriber")
diff --git a/lib/lp/soyuz/browser/tests/test_distroarchseries_webservice.py b/lib/lp/soyuz/browser/tests/test_distroarchseries_webservice.py
index 4555f60..1db0346 100644
--- a/lib/lp/soyuz/browser/tests/test_distroarchseries_webservice.py
+++ b/lib/lp/soyuz/browser/tests/test_distroarchseries_webservice.py
@@ -198,7 +198,8 @@ class TestDistroArchSeriesWebservice(TestCaseWithFactory):
         sha1_1 = hashlib.sha1(b'abcxyz').hexdigest()
         ws_das.setChroot(data=b'abcxyz', sha1sum=sha1_1)
         sha1_2 = hashlib.sha1(b'123456').hexdigest()
-        ws_das.setChroot(data=b'123456', sha1sum=sha1_2, image_type='LXD image')
+        ws_das.setChroot(
+            data=b'123456', sha1sum=sha1_2, image_type='LXD image')
         chroot_image = das.getChroot(image_type=BuildBaseImageType.CHROOT)
         self.assertEqual(sha1_1, chroot_image.content.sha1)
         lxd_image = das.getChroot(image_type=BuildBaseImageType.LXD)
diff --git a/lib/lp/soyuz/mail/tests/test_packageupload.py b/lib/lp/soyuz/mail/tests/test_packageupload.py
index c7378f9..1b59fd5 100644
--- a/lib/lp/soyuz/mail/tests/test_packageupload.py
+++ b/lib/lp/soyuz/mail/tests/test_packageupload.py
@@ -243,7 +243,7 @@ class TestNotificationRequiringLibrarian(TestCaseWithFactory):
             %s
             http://launchpad.test/~archiver/+archive/ubuntu/ppa
             You are receiving this email because you made this upload.
-            """ % "-- ")
+            """ % "-- ")  # noqa: E501
         self.assertEqual(expected_body, body)
 
 
diff --git a/lib/lp/testing/keyserver/tests/test_web.py b/lib/lp/testing/keyserver/tests/test_web.py
index e11f86c..74c343b 100644
--- a/lib/lp/testing/keyserver/tests/test_web.py
+++ b/lib/lp/testing/keyserver/tests/test_web.py
@@ -120,7 +120,7 @@ class TestWebResources(TestCase):
 ...
 pub  1024D/DFD20543 2005-04-13 Sample Person (revoked) &lt;[e-mail]&gt;
 ...
-''')
+''')  # noqa: E501
 
     def test_content_lookup(self):
         # A key content lookup form via GET.
diff --git a/lib/lp/translations/scripts/tests/test_packaging_translations.py b/lib/lp/translations/scripts/tests/test_packaging_translations.py
index 77673b8..766c749 100644
--- a/lib/lp/translations/scripts/tests/test_packaging_translations.py
+++ b/lib/lp/translations/scripts/tests/test_packaging_translations.py
@@ -39,7 +39,7 @@ class TestMergeTranslations(TestCaseWithFactory):
             INFO    Merging template 1/2.
             INFO    Merging template 2/2.
             INFO    Ran 1 TranslationMergeJob jobs.
-            """))
+            """))  # noqa: E501
         self.assertThat(stderr, matcher)
         self.assertEqual('', stdout)
 
@@ -57,6 +57,6 @@ class TestMergeTranslations(TestCaseWithFactory):
             INFO    Splitting .* and .* in Ubuntu Distroseries.*
             INFO    1 entries split.
             INFO    Ran 1 TranslationSplitJob jobs.
-            """))
+            """))  # noqa: E501
         self.assertThat(stderr, matcher)
         self.assertEqual('', stdout)
diff --git a/lib/lp/translations/utilities/gettext_po_parser.py b/lib/lp/translations/utilities/gettext_po_parser.py
index 925af2d..4756050 100644
--- a/lib/lp/translations/utilities/gettext_po_parser.py
+++ b/lib/lp/translations/utilities/gettext_po_parser.py
@@ -801,7 +801,7 @@ class POParser(object):
           Traceback (most recent call last):
             ...
           lp.translations.interfaces.translationimporter.TranslationFormatSyntaxError: Extra content found after string: (x)
-        """
+        """  # noqa: E501
         if self._escaped_line_break:
             # Continuing a line after an escaped newline.  Strip indentation.
             string = string.lstrip()
diff --git a/lib/lp/translations/utilities/tests/test_gettext_po_exporter.py b/lib/lp/translations/utilities/tests/test_gettext_po_exporter.py
index 7bf5479..916965e 100644
--- a/lib/lp/translations/utilities/tests/test_gettext_po_exporter.py
+++ b/lib/lp/translations/utilities/tests/test_gettext_po_exporter.py
@@ -133,7 +133,7 @@ class GettextPOExporterTestCase(TestCaseWithFactory):
 
             #~ msgid "zot"
             #~ msgstr "zat"
-            ''').encode('UTF-8')
+            ''').encode('UTF-8')  # noqa: E501
         cy_translation_file = self.parser.parse(pofile_cy)
         cy_translation_file.is_template = False
         cy_translation_file.language_code = 'cy'
diff --git a/lib/lp/translations/utilities/tests/test_xpi_po_exporter.py b/lib/lp/translations/utilities/tests/test_xpi_po_exporter.py
index 78ab7cc..a28be12 100644
--- a/lib/lp/translations/utilities/tests/test_xpi_po_exporter.py
+++ b/lib/lp/translations/utilities/tests/test_xpi_po_exporter.py
@@ -80,7 +80,7 @@ test_xpi_header = dedent(u'''\
         </em:targetApplication>
       </Description>
     </RDF>
-''')
+''')  # noqa: E501
 test_xpi_messages = [
     (u'foozilla.menu.title', u'main/subdir/test2.dtd',
      u'jar:chrome/en-US.jar!/subdir/test2.dtd', u'MENU',
@@ -385,7 +385,7 @@ class XPIPOExporterTestCase(TestCase):
             msgctxt "main/test1.properties"
             msgid "Дан=Day"
             msgstr ""
-            ''').strip()
+            ''').strip()  # noqa: E501
 
         output = storage.export().read().decode("utf-8")
         self._compareExpectedAndExported(expected_template, output)
diff --git a/scripts/update-stacked-on.py b/scripts/update-stacked-on.py
index 1648ec9..85d4df3 100755
--- a/scripts/update-stacked-on.py
+++ b/scripts/update-stacked-on.py
@@ -6,7 +6,8 @@
 """Update stacked_on_location for all Bazaar branches.
 
 Expects standard input of:
-    '<id> <branch_type> <unique_name> <stacked_on_id> <stacked_on_unique_name>\n'.
+    '<id> <branch_type> <unique_name> <stacked_on_id>
+     <stacked_on_unique_name>\n'.
 
 Such input can be provided using "get-stacked-on-branches.py".
 
diff --git a/test_on_merge.py b/test_on_merge.py
index a1cd0e2..59fa01b 100755
--- a/test_on_merge.py
+++ b/test_on_merge.py
@@ -179,7 +179,8 @@ def run_test_process():
         # bzr. -- mbp 20100924
         while True:
             try:
-                rlist, wlist, xlist = select.select(open_readers, [], [], TIMEOUT)
+                rlist, wlist, xlist = select.select(
+                    open_readers, [], [], TIMEOUT)
                 break
             except select.error as e:
                 # nb: select.error doesn't expose a named 'errno' attribute,
diff --git a/utilities/community-contributions.py b/utilities/community-contributions.py
index 10f07e9..d9c59e2 100755
--- a/utilities/community-contributions.py
+++ b/utilities/community-contributions.py
@@ -104,111 +104,112 @@ CANONICAL_ADDR = wiki_encode(u" {_AT_} canonical.com")
 
 # People on the Canonical Launchpad team.
 known_canonical_lp_devs = \
-    [wiki_encode(x) for x in (u'Aaron Bentley',
-                              u'Abel Deuring',
-                              u'Andrew Bennetts',
-                              u'Barry Warsaw',
-                              u'Benji York',
-                              u'Bjorn Tillenius',
-                              u'Björn Tillenius',
-                              u'Brad Bollenbach',
-                              u'Brad Crittenden',
-                              u'Brian Fromme',
-                              u'Canonical.com Patch Queue Manager',
-                              u'Carlos Perello Marin',
-                              u'Carlos Perelló Marín',
-                              u'carlos.perello {_AT_} canonical.com',
-                              u'Celso Providelo',
-                              u'Christian Reis',
-                              u'Christian Robottom Reis',
-                              u'kiko {_AT_} beetle',
-                              u'Colin Watson',
-                              u'Curtis Hovey',
-                              u'Dafydd Harries',
-                              u'Danilo Šegan',
-                              u'Danilo Segan',
-                              u'david <david {_AT_} marvin>',
-                              u'Данило Шеган',
-                              u'данило шеган',
-                              u'Daniel Silverstone',
-                              u'David Allouche',
-                              u'Deryck Hodge',
-                              u'Diogo Matsubara',
-                              u'Edwin Grubbs',
-                              u'Elliot Murphy',
-                              u'Firstname Lastname',
-                              u'Francesco Banconi',
-                              u'Francis Lacoste',
-                              u'Francis J. Lacoste',
-                              u'Gary Poster',
-                              u'Gavin Panella',
-                              u'Graham Binns',
-                              u'Guilherme Salgado',
-                              u'Henning Eggers',
-                              u'Herb McNew',
-                              u'Huw Wilkins',
-                              u'Ian Booth',
-                              u'James Henstridge',
-                              u'j.c.sackett',
-                              u'jc',
-                              u'Jelmer Vernooij',
-                              u'Jeroen Vermeulen',
-                              u'Jeroen T. Vermeulen',
-                              u'Joey Stanford',
-                              u'Jon Sackett',
-                              u'Jonathan Lange',
-                              u'j.c.sackett',
-                              u'jonathan.sackett {_AT_} canonical.com',
-                              u'jml {_AT_} canonical.com',
-                              u'jml {_AT_} mumak.net',
-                              u'Jonathan Knowles',
-                              u'jonathan.knowles {_AT_} canonical.com',
-                              u'Julian Edwards',
-                              u'Karl Fogel',
-                              u'Kit Randel',
-                              u'Launch Pad',
-                              u'Launchpad APA',
-                              u'Launchpad Developers',
-                              u'Launchpad Patch Queue Manager',
-                              u'Launchpad PQM Bot',
-                              u'Leonard Richardson',
-                              u'Malcolm Cleaton',
-                              u'Maris Fogels',
-                              u'Mark Shuttleworth',
-                              u'Martin Albisetti',
-                              u'Matt Zimmerman',
-                              u'Matthew Paul Thomas',
-                              u'Matthew Thomas',
-                              u'Matthew Revell',
-                              u'matthew.revell {_AT_} canonical.com',
-                              u'Michael Hudson',
-                              u'michael.hudson {_AT_} canonical.com',
-                              u'Michael Nelson',
-                              u'Muharem Hrnjadovic',
-                              u'muharem {_AT_} canonical.com',
-                              u'Patch Queue Manager',
-                              u'Paul Hummer',
-                              u'Raphael Badin',
-                              u'Raphaël Badin',
-                              u'Richard Harding',
-                              u'Rick Harding',
-                              u'Rick harding',
-                              u'Robert Collins',
-                              u'root <root {_AT_} ubuntu>',
-                              u'rvb',
-                              u'Stuart Bishop',
-                              u'Steve Alexander',
-                              u'Steve Kowalik',
-                              u'Steve McInerney',
-                              u'<steve {_AT_} stedee.id.au>',
-                              u'test {_AT_} canonical.com',
-                              u'Tom Haddon',
-                              u'Tim Penhey',
-                              u'Tom Berger',
-                              u'ubuntu <ubuntu {_AT_} lp-dev>',
-                              u'Ursula Junque',
-                              u'William Grant <william.grant {_AT_} canonical.com>',
-                              )]
+    [wiki_encode(x) for x in (
+        u'Aaron Bentley',
+        u'Abel Deuring',
+        u'Andrew Bennetts',
+        u'Barry Warsaw',
+        u'Benji York',
+        u'Bjorn Tillenius',
+        u'Björn Tillenius',
+        u'Brad Bollenbach',
+        u'Brad Crittenden',
+        u'Brian Fromme',
+        u'Canonical.com Patch Queue Manager',
+        u'Carlos Perello Marin',
+        u'Carlos Perelló Marín',
+        u'carlos.perello {_AT_} canonical.com',
+        u'Celso Providelo',
+        u'Christian Reis',
+        u'Christian Robottom Reis',
+        u'kiko {_AT_} beetle',
+        u'Colin Watson',
+        u'Curtis Hovey',
+        u'Dafydd Harries',
+        u'Danilo Šegan',
+        u'Danilo Segan',
+        u'david <david {_AT_} marvin>',
+        u'Данило Шеган',
+        u'данило шеган',
+        u'Daniel Silverstone',
+        u'David Allouche',
+        u'Deryck Hodge',
+        u'Diogo Matsubara',
+        u'Edwin Grubbs',
+        u'Elliot Murphy',
+        u'Firstname Lastname',
+        u'Francesco Banconi',
+        u'Francis Lacoste',
+        u'Francis J. Lacoste',
+        u'Gary Poster',
+        u'Gavin Panella',
+        u'Graham Binns',
+        u'Guilherme Salgado',
+        u'Henning Eggers',
+        u'Herb McNew',
+        u'Huw Wilkins',
+        u'Ian Booth',
+        u'James Henstridge',
+        u'j.c.sackett',
+        u'jc',
+        u'Jelmer Vernooij',
+        u'Jeroen Vermeulen',
+        u'Jeroen T. Vermeulen',
+        u'Joey Stanford',
+        u'Jon Sackett',
+        u'Jonathan Lange',
+        u'j.c.sackett',
+        u'jonathan.sackett {_AT_} canonical.com',
+        u'jml {_AT_} canonical.com',
+        u'jml {_AT_} mumak.net',
+        u'Jonathan Knowles',
+        u'jonathan.knowles {_AT_} canonical.com',
+        u'Julian Edwards',
+        u'Karl Fogel',
+        u'Kit Randel',
+        u'Launch Pad',
+        u'Launchpad APA',
+        u'Launchpad Developers',
+        u'Launchpad Patch Queue Manager',
+        u'Launchpad PQM Bot',
+        u'Leonard Richardson',
+        u'Malcolm Cleaton',
+        u'Maris Fogels',
+        u'Mark Shuttleworth',
+        u'Martin Albisetti',
+        u'Matt Zimmerman',
+        u'Matthew Paul Thomas',
+        u'Matthew Thomas',
+        u'Matthew Revell',
+        u'matthew.revell {_AT_} canonical.com',
+        u'Michael Hudson',
+        u'michael.hudson {_AT_} canonical.com',
+        u'Michael Nelson',
+        u'Muharem Hrnjadovic',
+        u'muharem {_AT_} canonical.com',
+        u'Patch Queue Manager',
+        u'Paul Hummer',
+        u'Raphael Badin',
+        u'Raphaël Badin',
+        u'Richard Harding',
+        u'Rick Harding',
+        u'Rick harding',
+        u'Robert Collins',
+        u'root <root {_AT_} ubuntu>',
+        u'rvb',
+        u'Stuart Bishop',
+        u'Steve Alexander',
+        u'Steve Kowalik',
+        u'Steve McInerney',
+        u'<steve {_AT_} stedee.id.au>',
+        u'test {_AT_} canonical.com',
+        u'Tom Haddon',
+        u'Tim Penhey',
+        u'Tom Berger',
+        u'ubuntu <ubuntu {_AT_} lp-dev>',
+        u'Ursula Junque',
+        u'William Grant <william.grant {_AT_} canonical.com>',
+        )]
 
 # People known to work for Canonical but not on the Launchpad team.
 # Anyone with "@canonical.com" in their email address is considered to
@@ -641,7 +642,7 @@ generates this page is \
 [[https://bazaar.launchpad.net/%7Elaunchpad-pqm/launchpad/devel/annotate/head%3A/utilities/community-contributions.py|utilities/community-contributions.py]] \
 in the Launchpad tree.''-~
 
-"""
+"""  # noqa: E501
 
 
 def main():