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

[Martin Packman]

Fix E999 lint error for Python 2 flake8.

Fix E999 lint error for Python 2 flake8

Ignore D and I flake8 plugin rule prefixes for now.

Fix some newly introduced rule breakage.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/git/tests/test_workingtree.py'
--- breezy/git/tests/test_workingtree.py	2018-11-16 22:18:20 +0000
+++ breezy/git/tests/test_workingtree.py	2018-11-17 16:31:16 +0000
@@ -249,10 +249,9 @@
         a = Blob.from_string(b'irrelevant\n')
         with self.wt.lock_tree_write():
             (index, index_path) = self.wt._lookup_index(b'a')
-            index[b'a'] = IndexEntry(
-                    0, 0, 0, 0, S_IFGITLINK, 0, 0, 0, a.id, 0)
+            index[b'a'] = IndexEntry(0, 0, 0, 0, S_IFGITLINK, 0, 0, 0, a.id, 0)
             self.wt._index_dirty = True
         t = Tree()
-        t.add(b"a", S_IFGITLINK , a.id)
+        t.add(b"a", S_IFGITLINK, a.id)
         self.store.add_object(t)
         self.expectDelta([], tree_id=t.id)

=== modified file 'breezy/tests/per_workingtree/test_workingtree.py'
--- breezy/tests/per_workingtree/test_workingtree.py	2018-11-16 23:21:31 +0000
+++ breezy/tests/per_workingtree/test_workingtree.py	2018-11-17 16:31:16 +0000
@@ -1077,8 +1077,8 @@
         os.unlink('tree/a')
         try:
             self.assertEqual(
-                    {'a', 'b', ''},
-                    set(tree.all_versioned_paths()))
+                {'a', 'b', ''},
+                set(tree.all_versioned_paths()))
         except errors.UnsupportedOperation:
             raise TestNotApplicable('tree does not support all_file_ids')
 

=== modified file 'setup.cfg'
--- setup.cfg	2018-11-16 19:38:57 +0000
+++ setup.cfg	2018-11-17 16:31:16 +0000
@@ -3,6 +3,8 @@
 # because even with the lazy import plugin it still triggers
 # for lazy_import statements before other imports.
 ignore =
+   D
+   I
    E123
    E241
    E251
@@ -29,7 +31,6 @@
    E722
    E731
    E741
-   E999
    F401
    F402
    F403

=== modified file 'tools/capture_tree.py'
--- tools/capture_tree.py	2017-05-22 00:56:52 +0000
+++ tools/capture_tree.py	2018-11-17 16:31:16 +0000
@@ -2,14 +2,16 @@
 
 # Copyright (C) 2005 Canonical Ltd
 
-"""Print to stdout a description of the current directory, 
+"""Print to stdout a description of the current directory,
 formatted as a Python data structure.
 
 This can be useful in tests that need to recreate directory
 contents."""
 
+from __future__ import print_function
+
+import os
 import sys
-import os
 
 from breezy.trace import enable_default_logging
 enable_default_logging()

=== modified file 'tools/prepare_for_latex.py'
--- tools/prepare_for_latex.py	2018-11-16 13:02:50 +0000
+++ tools/prepare_for_latex.py	2018-11-17 16:31:16 +0000
@@ -26,6 +26,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
+from __future__ import print_function
+
 import os
 import re
 import shutil
@@ -35,8 +37,8 @@
 
 verbose = False
 
-IMAGE_DIRECTIVE_PATTERN = re.compile(ur'^..\s+image::\s+(.*)\s+$')
-DIRECTIVE_ELEMENT_PATTERN = re.compile(ur'^\s+:[^:]+:\s+')
+IMAGE_DIRECTIVE_PATTERN = re.compile(u'^..\\s+image::\\s+(.*)\`\s+$')
+DIRECTIVE_ELEMENT_PATTERN = re.compile(u'^\\s+:[^:]+:\\s+')
 
 class Converter(object):
     def __init__(self, srcdir, destdir):