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

[Martin Packman]

Fix whitespace lint E241 and E251

Fix whitespace lint E241 and E251

Includes editing the third-party bootstrap script which should maybe
just go, but can deal with that later.

[Jelmer Vernooij (jelmer)]

review: Approve

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'setup.cfg'
--- setup.cfg	2018-11-18 12:41:12 +0000
+++ setup.cfg	2018-11-18 19:11:39 +0000
@@ -6,8 +6,6 @@
    D
    I
    E123
-   E241
-   E251
    E261
    E265
    E266
 
=== modified file 'setup.py'
--- setup.py	2018-11-17 16:53:10 +0000
+++ setup.py	2018-11-18 19:11:39 +0000
@@ -32,13 +32,13 @@
 # META INFORMATION FOR SETUP
 # see http://docs.python.org/dist/meta-data.html
 META_INFO = {
-    'name':         'breezy',
-    'version':      breezy.__version__,
-    'maintainer':   'Breezy Developers',
-    'maintainer_email':   '[e-mail]',
-    'url':          'https://www.breezy-vcs.org/',
-    'description':  'Friendly distributed version control system',
-    'license':      'GNU GPL v2',
+    'name': 'breezy',
+    'version': breezy.__version__,
+    'maintainer': 'Breezy Developers',
+    'maintainer_email': '[e-mail]',
+    'url': 'https://www.breezy-vcs.org/',
+    'description': 'Friendly distributed version control system',
+    'license': 'GNU GPL v2',
     'download_url': 'https://launchpad.net/brz/+download',
     'long_description': get_long_description(),
     'classifiers': [
@@ -382,9 +382,9 @@
     # tbzrcache executables - a "console" version for debugging and a
     # GUI version that is generally used.
     tbzrcache = dict(
-        script = os.path.join(tbzr_root, "scripts", "tbzrcache.py"),
-        icon_resources = icon_resources,
-        other_resources = other_resources,
+        script=os.path.join(tbzr_root, "scripts", "tbzrcache.py"),
+        icon_resources=icon_resources,
+        other_resources=other_resources,
     )
     console_targets.append(tbzrcache)
 
@@ -395,9 +395,9 @@
 
     # ditto for the tbzrcommand tool
     tbzrcommand = dict(
-        script = os.path.join(tbzr_root, "scripts", "tbzrcommand.py"),
-        icon_resources = icon_resources,
-        other_resources = other_resources,
+        script=os.path.join(tbzr_root, "scripts", "tbzrcommand.py"),
+        icon_resources=icon_resources,
+        other_resources=other_resources,
     )
     console_targets.append(tbzrcommand)
     tbzrcommandw = tbzrcommand.copy()
@@ -561,17 +561,18 @@
             self.outfiles.extend([f + 'o' for f in compile_names])
     # end of class install_data_with_bytecompile
 
-    target = py2exe.build_exe.Target(script = "brz",
-                                     dest_base = "brz",
-                                     icon_resources = [(0, 'brz.ico')],
-                                     name = META_INFO['name'],
-                                     version = version_str,
-                                     description = META_INFO['description'],
-                                     author = META_INFO['author'],
-                                     copyright = "(c) Canonical Ltd, 2005-2010",
-                                     company_name = "Canonical Ltd.",
-                                     comments = META_INFO['description'],
-                                     )
+    target = py2exe.build_exe.Target(
+        script="brz",
+        dest_base="brz",
+        icon_resources=[(0, 'brz.ico')],
+        name=META_INFO['name'],
+        version=version_str,
+        description=META_INFO['description'],
+        author=META_INFO['author'],
+        copyright="(c) Canonical Ltd, 2005-2010",
+        company_name="Canonical Ltd.",
+        comments=META_INFO['description'],
+    )
     gui_target = copy.copy(target)
     gui_target.dest_base = "bzrw"
 
 
=== modified file 'tools/win32/bootstrap.py'
--- tools/win32/bootstrap.py	2018-11-16 13:00:09 +0000
+++ tools/win32/bootstrap.py	2018-11-18 19:11:39 +0000
@@ -48,16 +48,13 @@
 
 cmd = 'from setuptools.command.easy_install import main; main()'
 ws = pkg_resources.working_set
+env = dict(
+    os.environ,
+    PYTHONPATH=ws.find(pkg_resources.Requirement.parse('setuptools')).location)
 
 if is_jython:
     import subprocess
 
-    env = dict(
-        os.environ,
-        PYTHONPATH=ws.find(
-            pkg_resources.Requirement.parse('setuptools')).location
-        )
-
     assert subprocess.Popen(
         [sys.executable] +
         ['-c', quote(cmd), '-mqNxd', quote(tmpeggs), 'zc.buildout'],
@@ -66,12 +63,7 @@
 else:
     assert os.spawnle(
         os.P_WAIT, sys.executable, quote(sys.executable),
-        '-c', quote(cmd), '-mqNxd', quote(tmpeggs), 'zc.buildout',
-        dict(
-            os.environ,
-            PYTHONPATH=
-            ws.find(pkg_resources.Requirement.parse('setuptools')).location
-            ),
+        '-c', quote(cmd), '-mqNxd', quote(tmpeggs), 'zc.buildout', env,
         ) == 0
 
 ws.add_entry(tmpeggs)