Merge lp:~gz/brz/lint_W1_W2_W3 into lp:brz

[Martin Packman]

Fix remaining whitespace lint in codebase

Fix remaining whitespace lint in codebase

Enables rules W191, W291, W293, and W391 for flake8.

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/98/

[Jelmer Vernooij (jelmer)]

Significant whitespace? (:

On November 18, 2018 8:44:05 PM UTC, The Breezy Bot <email address hidden> wrote:
>Running landing tests failed
>https://ci.breezy-vcs.org/job/brz/job/brz-land/98/
>--
>https://code.launchpad.net/~gz/brz/lint_W1_W2_W3/+merge/358968
>You are reviewing the proposed merge of lp:~gz/brz/lint_W1_W2_W3 into
>lp:brz.

=== modified file 'apport/source_brz.py'
--- apport/source_brz.py	2017-07-30 16:59:50 +0000
+++ apport/source_brz.py	2018-11-20 21:26:00 +0000
@@ -24,7 +24,7 @@
         if line == '\n':
             blanks += 1
         brz_log_tail.append(line)
-        if blanks >= 2: 
+        if blanks >= 2:
             break
 
     brz_log_tail.reverse()
@@ -36,7 +36,7 @@
     if 'BrzPlugins' not in report:
         # may already be present in-process
         report['BrzPlugins'] = command_output(['brz', 'plugins', '-v'])
-        
+
     # by default assume brz crashes are upstream bugs; this relies on
     # having a brz entry under /etc/apport/crashdb.conf.d/
     report['CrashDB'] = 'brz'
@@ -49,5 +49,5 @@
     #attach_file_if_exists(report,
     #	os.path.join(dot_brz, 'locations.conf', 'BrzLocations')
 
-        
+
 # vim: expandtab shiftwidth=4
 
=== modified file 'breezy/bzr/bzrdir.py'
--- breezy/bzr/bzrdir.py	2018-11-16 18:33:17 +0000
+++ breezy/bzr/bzrdir.py	2018-11-20 21:26:00 +0000
@@ -669,7 +669,7 @@
 
         This is true IF and ONLY IF the filename is part of the namespace
         reserved for bzr control dirs. Currently this is the '.bzr' directory
-        in the root of the root_transport. 
+        in the root of the root_transport.
         """
         # this might be better on the BzrDirFormat class because it refers to
         # all the possible bzrdir disk formats.
 
=== modified file 'breezy/bzr/dirstate.py'
--- breezy/bzr/dirstate.py	2018-11-12 01:41:38 +0000
+++ breezy/bzr/dirstate.py	2018-11-20 21:26:00 +0000
@@ -28,7 +28,7 @@
     WHOLE_NUMBER = {digit}, digit;
     BOOLEAN = "y" | "n";
     REVISION_ID = a non-empty utf8 string;
-    
+
     dirstate format = header line, full checksum, row count, parent details,
      ghost_details, entries;
     header line = "#bazaar dirstate flat format 3", NL;
@@ -3578,7 +3578,7 @@
         """Compare an entry and real disk to generate delta information.
 
         :param path_info: top_relpath, basename, kind, lstat, abspath for
-            the path of entry. If None, then the path is considered absent in 
+            the path of entry. If None, then the path is considered absent in
             the target (Perhaps we should pass in a concrete entry for this ?)
             Basename is returned as a utf8 string because we expect this
             tuple will be ignored, and don't want to take the time to
 
=== modified file 'breezy/bzr/index.py'
--- breezy/bzr/index.py	2018-11-12 01:41:38 +0000
+++ breezy/bzr/index.py	2018-11-20 21:26:00 +0000
@@ -310,7 +310,7 @@
     def finish(self):
         """Finish the index.
 
-        :returns: cBytesIO holding the full context of the index as it 
+        :returns: cBytesIO holding the full context of the index as it
         should be written to disk.
         """
         lines = [_SIGNATURE]
 
=== modified file 'breezy/bzr/inventory.py'
--- breezy/bzr/inventory.py	2018-11-16 11:37:47 +0000
+++ breezy/bzr/inventory.py	2018-11-20 21:26:00 +0000
@@ -1480,7 +1480,7 @@
 
         if given [foo-id] we will include
             TREE_ROOT as interesting parents
-        and 
+        and
             foo-id, baz-id, frob-id, fringle-id
         As interesting ids.
         """
 
=== modified file 'breezy/bzr/workingtree_4.py'
--- breezy/bzr/workingtree_4.py	2018-11-16 18:33:17 +0000
+++ breezy/bzr/workingtree_4.py	2018-11-20 21:26:00 +0000
@@ -1403,7 +1403,7 @@
 class ContentFilteringDirStateWorkingTree(DirStateWorkingTree):
     """Dirstate working tree that supports content filtering.
 
-    The dirstate holds the hash and size of the canonical form of the file, 
+    The dirstate holds the hash and size of the canonical form of the file,
     and most methods must return that.
     """
 
 
=== modified file 'breezy/config.py'
--- breezy/config.py	2018-11-16 12:08:41 +0000
+++ breezy/config.py	2018-11-20 21:26:00 +0000
@@ -2105,7 +2105,7 @@
         :param override_existing: Raise KeyErorr if False and something has
                 already been registered for that key. If True, ignore if there
                 is an existing key (always register the new value).
-        :param fallback: Whether this credential store should be 
+        :param fallback: Whether this credential store should be
                 used as fallback.
         """
         return super(CredentialStoreRegistry,
@@ -2125,7 +2125,7 @@
         :param override_existing: If True, replace the existing object
                 with the new one. If False, if there is already something
                 registered with the same key, raise a KeyError
-        :param fallback: Whether this credential store should be 
+        :param fallback: Whether this credential store should be
                 used as fallback.
         """
         return super(CredentialStoreRegistry, self).register_lazy(
 
=== modified file 'breezy/counted_lock.py'
--- breezy/counted_lock.py	2018-11-11 04:08:32 +0000
+++ breezy/counted_lock.py	2018-11-20 21:26:00 +0000
@@ -29,7 +29,7 @@
     This can be used with any object that provides a basic Lock interface,
     including LockDirs and OS file locks.
 
-    :ivar _token: While a write lock is held, this is the token 
+    :ivar _token: While a write lock is held, this is the token
         for it.
     """
 
@@ -81,7 +81,7 @@
 
         If the lock was originally acquired in read mode this will fail.
 
-        :param token: If given and the lock is already held, 
+        :param token: If given and the lock is already held,
             then validate that we already hold the real
             lock with this token.
 
 
=== modified file 'breezy/diff.py'
--- breezy/diff.py	2018-11-16 18:33:17 +0000
+++ breezy/diff.py	2018-11-20 21:26:00 +0000
@@ -447,10 +447,10 @@
     :param to_file: The output stream.
     :param specific_files: Include only changes to these files - None for all
         changes.
-    :param external_diff_options: If set, use an external GNU diff and pass 
+    :param external_diff_options: If set, use an external GNU diff and pass
         these options.
     :param extra_trees: If set, more Trees to use for looking up file ids
-    :param path_encoding: If set, the path will be encoded as specified, 
+    :param path_encoding: If set, the path will be encoded as specified,
         otherwise is supposed to be utf8
     :param format_cls: Formatter class (DiffTree subclass)
     """
 
=== modified file 'breezy/foreign.py'
--- breezy/foreign.py	2018-11-16 12:08:41 +0000
+++ breezy/foreign.py	2018-11-20 21:26:00 +0000
@@ -145,7 +145,7 @@
         """Serialize a foreign revision id for this VCS.
 
         :param foreign_revid: Foreign revision id
-        :return: Bytestring with serialized revid, will not contain any 
+        :return: Bytestring with serialized revid, will not contain any
             newlines.
         """
         raise NotImplementedError(self.serialize_foreign_revid)
 
=== modified file 'breezy/globbing.py'
--- breezy/globbing.py	2018-11-12 01:41:38 +0000
+++ breezy/globbing.py	2018-11-20 21:26:00 +0000
@@ -297,9 +297,9 @@
     """A Globster that supports exception patterns.
 
     Exceptions are ignore patterns prefixed with '!'.  Exception
-    patterns take precedence over regular patterns and cause a 
-    matching filename to return None from the match() function.  
-    Patterns using a '!!' prefix are highest precedence, and act 
+    patterns take precedence over regular patterns and cause a
+    matching filename to return None from the match() function.
+    Patterns using a '!!' prefix are highest precedence, and act
     as regular ignores. '!!' patterns are useful to establish ignores
     that apply under paths specified by '!' exception patterns.
     """
 
=== modified file 'breezy/help_topics/__init__.py'
--- breezy/help_topics/__init__.py	2018-11-11 04:08:32 +0000
+++ breezy/help_topics/__init__.py	2018-11-20 21:26:00 +0000
@@ -526,10 +526,10 @@
 repository (a shared repository). Branches can be copied and merged.
 
 In addition, one branch may be bound to another one.  Binding to another
-branch indicates that commits which happen in this branch must also 
-happen in the other branch.  Breezy ensures consistency by not allowing 
-commits when the two branches are out of date.  In order for a commit 
-to succeed, it may be necessary to update the current branch using 
+branch indicates that commits which happen in this branch must also
+happen in the other branch.  Breezy ensures consistency by not allowing
+commits when the two branches are out of date.  In order for a commit
+to succeed, it may be necessary to update the current branch using
 ``brz update``.
 
 Related commands::
 
=== modified file 'breezy/plugins/bash_completion/bashcomp.py'
--- breezy/plugins/bash_completion/bashcomp.py	2018-11-16 11:54:55 +0000
+++ breezy/plugins/bash_completion/bashcomp.py	2018-11-20 21:26:00 +0000
@@ -422,7 +422,7 @@
     This command generates a shell function which can be used by bash to
     automatically complete the currently typed command when the user presses
     the completion key (usually tab).
-    
+
     Commonly used like this:
         eval "`brz bash-completion`"
     """
 
=== modified file 'breezy/plugins/fastimport/cmds.py'
--- breezy/plugins/fastimport/cmds.py	2018-11-11 04:08:32 +0000
+++ breezy/plugins/fastimport/cmds.py	2018-11-20 21:26:00 +0000
@@ -85,7 +85,7 @@
       bzr fast-import project.fi project.bzr
 
     Numerous commands are provided for generating a fast-import file
-    to use as input. 
+    to use as input.
     To specify standard input as the input stream, use a
     source name of '-' (instead of project.fi). If the source name
     ends in '.gz', it is assumed to be compressed in gzip format.
 
=== modified file 'breezy/plugins/launchpad/__init__.py'
--- breezy/plugins/launchpad/__init__.py	2018-11-11 04:08:32 +0000
+++ breezy/plugins/launchpad/__init__.py	2018-11-20 21:26:00 +0000
@@ -17,7 +17,7 @@
 """Launchpad.net integration plugin for Bazaar.
 
 This plugin provides facilities for working with Bazaar branches that are
-hosted on Launchpad (http://launchpad.net).  It provides a directory service 
+hosted on Launchpad (http://launchpad.net).  It provides a directory service
 for referring to Launchpad branches using the "lp:" prefix.  For example,
 lp:bzr refers to the Bazaar's main development branch and
 lp:~username/project/branch-name can be used to refer to a specific branch.
 
=== modified file 'breezy/plugins/upload/__init__.py'
--- breezy/plugins/upload/__init__.py	2018-11-11 04:08:32 +0000
+++ breezy/plugins/upload/__init__.py	2018-11-20 21:26:00 +0000
@@ -32,7 +32,7 @@
 
     brz upload -r X  sftp://user@host/location/on/webserver
 
-bzr-upload, just as brz does, will remember the location where you upload the 
+bzr-upload, just as brz does, will remember the location where you upload the
 first time, so you don't need to specify it every time.
 
 If you need to re-upload the whole working tree for some reason, you can:
@@ -107,7 +107,7 @@
 It is possible to upload to a remote location from another remote location by
 specifying it with the --directory option:
 
-    brz upload sftp://public.example.com --directory sftp://private.example.com 
+    brz upload sftp://public.example.com --directory sftp://private.example.com
 
 This, together with --auto, can be used to upload when you push to your
 central branch, rather than when you commit to your local branch.
 
=== modified file 'breezy/repository.py'
--- breezy/repository.py	2018-11-11 04:08:32 +0000
+++ breezy/repository.py	2018-11-20 21:26:00 +0000
@@ -1144,7 +1144,7 @@
         :param callback_refs: A dict of check-refs to resolve and callback
             the check/_check method on the items listed as wanting the ref.
             see breezy.check.
-        :param check_repo: If False do not check the repository contents, just 
+        :param check_repo: If False do not check the repository contents, just
             calculate the data callback_refs requires and call them back.
         """
         return self._check(revision_ids=revision_ids, callback_refs=callback_refs,
 
=== modified file 'breezy/tests/blackbox/test_uncommit.py'
--- breezy/tests/blackbox/test_uncommit.py	2018-07-17 21:50:43 +0000
+++ breezy/tests/blackbox/test_uncommit.py	2018-11-20 21:26:00 +0000
@@ -237,7 +237,7 @@
         script = ScriptRunner()
         script.run_script(self, """
 $ cd tree
-$ brz uncommit --force 
+$ brz uncommit --force
     2 ...
       second commit
 ...
 
=== modified file 'breezy/tests/per_controldir_colo/__init__.py'
--- breezy/tests/per_controldir_colo/__init__.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/per_controldir_colo/__init__.py	2018-11-20 21:26:00 +0000
@@ -18,7 +18,7 @@
 """BzrDir implementation tests for colocated branch support.
 
 These tests check the conformance of the colocated branches support.
-All bzrdir formats are tested - those that do not suppport colocated branches 
+All bzrdir formats are tested - those that do not suppport colocated branches
 have the test_unsupported tests run; the others have the test_supported tests
 run.
 """
 
=== modified file 'breezy/tests/per_controldir_colo/test_unsupported.py'
--- breezy/tests/per_controldir_colo/test_unsupported.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/per_controldir_colo/test_unsupported.py	2018-11-20 21:26:00 +0000
@@ -16,7 +16,7 @@
 
 """Tests for bazaar control directories that do not support colocated branches.
 
-Colocated branch support is optional, and when it is not supported the methods 
+Colocated branch support is optional, and when it is not supported the methods
 and attributes colocated branch support added should fail in known ways.
 """
 
 
=== modified file 'breezy/tests/per_foreign_vcs/test_branch.py'
--- breezy/tests/per_foreign_vcs/test_branch.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/per_foreign_vcs/test_branch.py	2018-11-20 21:26:00 +0000
@@ -49,8 +49,8 @@
 class ForeignBranchTests(TestCaseWithTransport):
     """Basic tests for foreign branch implementations.
 
-    These tests mainly make sure that the implementation covers the required 
-    bits of the API and returns reasonable values. 
+    These tests mainly make sure that the implementation covers the required
+    bits of the API and returns reasonable values.
     """
     branch_factory = None  # Set to an instance of ForeignBranchFactory by scenario
 
 
=== modified file 'breezy/tests/scenarios.py'
--- breezy/tests/scenarios.py	2017-05-23 14:08:03 +0000
+++ breezy/tests/scenarios.py	2018-11-20 21:26:00 +0000
@@ -46,7 +46,7 @@
 def multiply_tests_by_their_scenarios(some_tests, into_suite):
     """Multiply the tests in the given suite by their declared scenarios.
 
-    Each test must have a 'scenarios' attribute which is a list of 
+    Each test must have a 'scenarios' attribute which is a list of
     (name, params) pairs.
 
     :param some_tests: TestSuite or Test.
 
=== modified file 'breezy/tests/script.py'
--- breezy/tests/script.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/script.py	2018-11-20 21:26:00 +0000
@@ -142,7 +142,7 @@
 
     :param args: The command line arguments
 
-    :return: A tuple containing: 
+    :return: A tuple containing:
         - The file name redirected from or None
         - The file name redirected to or None
         - The mode to open the output file or None
 
=== modified file 'breezy/tests/test_gpg.py'
--- breezy/tests/test_gpg.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/test_gpg.py	2018-11-20 21:26:00 +0000
@@ -342,13 +342,13 @@
         self.import_keys()
         content = b"""-----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
- 
+
 bazaar-ng testament short form 1
 revision-id: [e-mail]-20110801100657-f1dr1nompeex723z
 sha1: 59ab434be4c2d5d646dee84f514aa09e1b72feeb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
- 
+
 iJwEAQECAAYFAk42esUACgkQHOJve0+NFRPc5wP7BoZkzBU8JaHMLv/LmqLr0sUz
 zuE51ofZZ19L7KVtQWsOi4jFy0fi4A5TFwO8u9SOfoREGvkw292Uty9subSouK5/
 mFmDOYPQ+O83zWgYZsBmMJWYDZ+X9I6XXZSbPtV/7XyTjaxtl5uRnDVJjg+AzKvD
 
=== modified file 'breezy/tests/test_help.py'
--- breezy/tests/test_help.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/test_help.py	2018-11-20 21:26:00 +0000
@@ -204,12 +204,12 @@
         """Concise help text excludes the descriptive sections."""
         class cmd_Demo(commands.Command):
             __doc__ = """A sample command.
- 
+
             Blah blah blah.
 
             :Examples:
                 Example 1::
- 
+
                     cmd arg1
             """
         cmd = cmd_Demo()
@@ -429,7 +429,7 @@
         # The help formatter expect the class name to start with 'cmd_'
         class cmd_Demo(commands.Command):
             __doc__ = """A sample command.
- 
+
             Blah blah blah.
 
             :Formats:
@@ -437,7 +437,7 @@
 
             :Examples:
               Example 1::
- 
+
                 cmd arg1
 
             :Tips:
@@ -455,18 +455,18 @@
 }}
 Description:
   zz{{zz{{Blah blah blah.}}
- 
+
 }}:Formats:
   zz{{Interesting stuff about formats.}}
- 
+
 Examples:
   zz{{Example 1::}}
- 
+
     zz{{cmd arg1}}
- 
+
 Tips:
   zz{{Clever things to keep in mind.}}
- 
+
 ''',
                            cmd_Demo())
 
 
=== modified file 'breezy/tests/test_script.py'
--- breezy/tests/test_script.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/test_script.py	2018-11-20 21:26:00 +0000
@@ -44,8 +44,8 @@
     def test_trim_blank_lines(self):
         """Blank lines are respected, but trimmed at the start and end.
 
-        Python triple-quoted syntax is going to give stubby/empty blank lines 
-        right at the start and the end.  These are cut off so that callers don't 
+        Python triple-quoted syntax is going to give stubby/empty blank lines
+        right at the start and the end.  These are cut off so that callers don't
         need special syntax to avoid them.
 
         However we do want to be able to match commands that emit blank lines.
@@ -186,7 +186,7 @@
             """)
 
     def test_null_output_matches_option(self):
-        """If you want null output to be a wild card, you can pass 
+        """If you want null output to be a wild card, you can pass
         null_output_matches_anything to run_script"""
         self.run_script(
             """
@@ -628,12 +628,11 @@
 
     def test_dont_shelve(self):
         # We intentionally provide no input here to test EOF
-        self.run_script("""
-            $ brz shelve -m 'shelve bar'
-            2>Shelve? ([y]es, [N]o, [f]inish, [q]uit): 
-            2>No changes to shelve.
-            """,
-                        null_output_matches_anything=True)
+        self.run_script((
+            "$ brz shelve -m 'shelve bar'\n"
+            "2>Shelve? ([y]es, [N]o, [f]inish, [q]uit): \n"
+            "2>No changes to shelve.\n"
+            ), null_output_matches_anything=True)
         self.run_script("""
             $ brz st
             modified:
 
=== modified file 'breezy/transform.py'
--- breezy/transform.py	2018-11-16 23:21:31 +0000
+++ breezy/transform.py	2018-11-20 21:26:00 +0000
@@ -604,7 +604,7 @@
 
         :param name: The basename of the file.
 
-        :param target_id: The directory trans_id where the backup should 
+        :param target_id: The directory trans_id where the backup should
             be placed.
         """
         known_children = self.by_parent().get(target_id, [])
 
=== modified file 'breezy/transport/__init__.py'
--- breezy/transport/__init__.py	2018-11-17 16:53:10 +0000
+++ breezy/transport/__init__.py	2018-11-20 21:26:00 +0000
@@ -265,7 +265,7 @@
     def fdatasync(self):
         """Force data out to physical disk if possible.
 
-        :raises TransportNotPossible: If this transport has no way to 
+        :raises TransportNotPossible: If this transport has no way to
             flush to disk.
         """
         raise errors.TransportNotPossible(
 
=== modified file 'breezy/transport/log.py'
--- breezy/transport/log.py	2018-11-11 04:08:32 +0000
+++ breezy/transport/log.py	2018-11-20 21:26:00 +0000
@@ -36,7 +36,7 @@
 
     Not all operations are logged yet.
 
-    See also TransportTraceDecorator, that records a machine-readable log in 
+    See also TransportTraceDecorator, that records a machine-readable log in
     memory for eg testing.
     """
 
 
=== modified file 'breezy/transport/trace.py'
--- breezy/transport/trace.py	2018-11-11 04:08:32 +0000
+++ breezy/transport/trace.py	2018-11-20 21:26:00 +0000
@@ -36,7 +36,7 @@
     operation please add a test to the tests of this transport, for the logging
     of the operation you want logged.
 
-    See also TransportLogDecorator, that records a machine-readable log in 
+    See also TransportLogDecorator, that records a machine-readable log in
     memory for eg testing.
     """
 
 
=== modified file 'breezy/tree.py'
--- breezy/tree.py	2018-11-16 18:40:46 +0000
+++ breezy/tree.py	2018-11-20 21:26:00 +0000
@@ -290,7 +290,7 @@
         :param path: A relative path within the tree.
         :return: A tuple containing kind, size, exec, sha1-or-link.
             Kind is always present (see tree.kind()).
-            size is present if kind is file and the size of the 
+            size is present if kind is file and the size of the
                 canonical form can be cheaply determined, None otherwise.
             exec is None unless kind is file and the platform supports the 'x'
                 bit.
 
=== modified file 'doc/en/conf.py'
--- doc/en/conf.py	2018-11-18 02:43:52 +0000
+++ doc/en/conf.py	2018-11-20 21:26:00 +0000
@@ -103,4 +103,3 @@
     # Miscellaneous
     'user-reference/readme',
 ]
-
 
=== modified file 'profile_imports.py'
--- profile_imports.py	2018-11-16 18:35:30 +0000
+++ profile_imports.py	2018-11-20 21:26:00 +0000
@@ -202,4 +202,3 @@
     """Remove the import and regex compile timing hooks."""
     __builtins__['__import__'] = _real_import
     re._compile = _real_compile
-
 
=== modified file 'setup.cfg'
--- setup.cfg	2018-11-18 20:59:41 +0000
+++ setup.cfg	2018-11-20 21:26:00 +0000
@@ -31,10 +31,6 @@
    F812
    F821
    F841
-   W191
-   W291
-   W293
-   W391
    W503
    W504
    W605
 
=== modified file 'tools/brz_epydoc_uid.py'
--- tools/brz_epydoc_uid.py	2017-05-21 18:10:28 +0000
+++ tools/brz_epydoc_uid.py	2018-11-20 21:26:00 +0000
@@ -40,4 +40,3 @@
 
 
 _ScopeReplacer._should_proxy = True
-
 
=== modified file 'tools/check-newsbugs.py'
--- tools/check-newsbugs.py	2018-11-16 12:54:47 +0000
+++ tools/check-newsbugs.py	2018-11-20 21:26:00 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-# Simple script that will check which bugs mentioned in NEWS 
+# Simple script that will check which bugs mentioned in NEWS
 # are not yet marked Fix Released in Launchpad
 
 import getopt, re, sys
 
=== modified file 'tools/generate_docs.py'
--- tools/generate_docs.py	2018-11-16 13:15:40 +0000
+++ tools/generate_docs.py	2018-11-20 21:26:00 +0000
@@ -25,7 +25,7 @@
     bash_completion  bash completion script
     ...
 
-Examples: 
+Examples:
 
     python generated-docs.py man
     python generated-docs.py bash_completion
@@ -99,7 +99,7 @@
 def print_extended_help(option, opt, value, parser):
     """ Program help examples
 
-    Prints out the examples stored in the docstring. 
+    Prints out the examples stored in the docstring.
 
     """
     sys.stdout.write(__doc__ % {"prog": sys.argv[0]})
 
=== modified file 'tools/generate_release_notes.py'
--- tools/generate_release_notes.py	2018-11-18 02:43:52 +0000
+++ tools/generate_release_notes.py	2018-11-20 21:26:00 +0000
@@ -58,7 +58,7 @@
 
 def natural_sort_key(file_name):
     """Split 'aaa-N.MMbbb' into ('aaa-', N, '.' MM, 'bbb')
-    
+
     e.g. 1.10b1 will sort as greater than 1.2::
 
         >>> natural_sort_key('brz-1.10b1.txt') > natural_sort_key('brz-1.2.txt')
 
=== modified file 'tools/riodemo.py'
--- tools/riodemo.py	2018-06-29 15:36:29 +0000
+++ tools/riodemo.py	2018-11-20 21:26:00 +0000
@@ -2,12 +2,12 @@
 
 
 # \subsection{Example usage}
-# 
-# \textbf{XXX:} Move these to object serialization code. 
+#
+# \textbf{XXX:} Move these to object serialization code.
 
 def write_revision(writer, revision):
     s = Stanza(revision=revision.revision_id,
-               committer=revision.committer, 
+               committer=revision.committer,
                timezone=long(revision.timezone),
                timestamp=long(revision.timestamp),
                inventory_sha1=revision.inventory_sha1,
 
=== modified file 'tools/rst2html.py'
--- tools/rst2html.py	2008-07-17 01:08:21 +0000
+++ tools/rst2html.py	2018-11-20 21:26:00 +0000
@@ -25,7 +25,7 @@
     # python-docutils 0.4-4 -- so monkeypatch in a better pattern
     #
     # This is a bit gross to patch because all this is built up at load time.
-    Body.pats['optname'] = r'[a-zA-Z0-9][a-zA-Z0-9._-]*'    
+    Body.pats['optname'] = r'[a-zA-Z0-9][a-zA-Z0-9._-]*'
     Body.pats['longopt'] = r'(--|/)%(optname)s([ =]%(optarg)s)?' % Body.pats
     Body.pats['option'] = r'(%(shortopt)s|%(longopt)s)' % Body.pats
     Body.patterns['option_marker'] = r'%(option)s(, %(option)s)*(  +| ?$)' % Body.pats
 
=== modified file 'tools/win32/brz_postinstall.py'
--- tools/win32/brz_postinstall.py	2018-11-18 12:18:44 +0000
+++ tools/win32/brz_postinstall.py	2018-11-20 21:26:00 +0000
@@ -283,7 +283,7 @@
                             f.write(i)
             else:
                 print('*** Remove line <%s> from autoexec.bat' % pattern)
-                    
+
         elif add_path and not found:
             backup_autoexec_bat(abat, abak, dry_run)
             if not dry_run: