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

[Martin Packman]

Apply ws_comma 2to3 fixer

This is just syntax related changes, but may as well apply now while we can minimise conflicts.

[Jelmer Vernooij (jelmer)]

review: Approve

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

The attempt to merge lp:~gz/brz/ws_comma into lp:brz failed. Below is the output from the failed tests.

brz: warning: some compiled extensions could not be loaded; see ``brz help missing-extensions``
warning: breezy/_annotator_pyx.pyx:107:18: Non-trivial type declarators in shared declaration (e.g. mix of pointers and values). Each pointer declaration should be on its own line.
warning: breezy/_annotator_pyx.pyx:107:25: Non-trivial type declarators in shared declaration (e.g. mix of pointers and values). Each pointer declaration should be on its own line.
warning: breezy/_annotator_pyx.pyx:107:32: Non-trivial type declarators in shared declaration (e.g. mix of pointers and values). Each pointer declaration should be on its own line.
warning: breezy/_annotator_pyx.pyx:174:22: Non-trivial type declarators in shared declaration (e.g. mix of pointers and values). Each pointer declaration should be on its own line.
warning: breezy/_annotator_pyx.pyx:174:33: Non-trivial type declarators in shared declaration (e.g. mix of pointers and values). Each pointer declaration should be on its own line.
warning: breezy/_annotator_pyx.pyx:175:18: Non-trivial type declarators in shared declaration (e.g. mix of pointers and values). Each pointer declaration should be on its own line.
warning: breezy/_annotator_pyx.pyx:175:30: Non-trivial type declarators in shared declaration (e.g. mix of pointers and values). Each pointer declaration should be on its own line.
warning: breezy/_annotator_pyx.pyx:200:18: Non-trivial type declarators in shared declaration (e.g. mix of pointers and values). Each pointer declaration should be on its own line.
warning: breezy/_annotator_pyx.pyx:200:29: Non-trivial type declarators in shared declaration (e.g. mix of pointers and values). Each pointer declaration should be on its own line.
breezy/_bencode_pyx.c: In function ‘__pyx_f_6breezy_12_bencode_pyx_7Encoder__encode_string’:
breezy/_bencode_pyx.c:4870:100: warning: format ‘%d’ expects argument of type ‘int’, but argument 4 has type ‘Py_ssize_t {aka long int}’ [-Wformat=]
   __pyx_v_n = snprintf(__pyx_v_self->tail, __pyx_e_6breezy_12_bencode_pyx_INT_BUF_SIZE, ((char *)"%d:"), __pyx_v_x_len);
                                                                                                   ~^
                                                                                                   %ld
warning: breezy/bzr/_groupcompress_pyx.pyx:329:54: Unreachable code
warning: breezy/bzr/_groupcompress_pyx.pyx:513:8: Unreachable code
warning: breezy/bzr/_groupcompress_pyx.pyx:450:23: Non-trivial type declarators in shared declaration (e.g. mix of pointers and values). Each pointer declaration should be on its own line.
warning: breezy/bzr/_groupcompress_pyx.pyx:450:30: Non-trivial type declarators in shared declaration (e.g. mix of pointers and values). Each pointer declaration should be on its own line.
warning: breezy/bzr/_groupcompress_pyx.pyx:451:23: Non-trivial type declarators in shared declaration (e.g. mix of pointers and values). Each pointer declaration should be on its own line.
warning: breezy/bzr/_groupcompress_pyx.pyx:451:33: Non-trivial type declarators in shared declarat...

=== modified file 'breezy/_readdir_py.py'
--- breezy/_readdir_py.py	2017-02-05 17:00:29 +0000
+++ breezy/_readdir_py.py	2017-11-12 14:04:35 +0000
@@ -31,13 +31,13 @@
 _unknown = 'unknown'
 
 _formats = {
-    stat.S_IFDIR:'directory',
-    stat.S_IFCHR:'chardev',
-    stat.S_IFBLK:'block',
-    stat.S_IFREG:'file',
-    stat.S_IFIFO:'fifo',
-    stat.S_IFLNK:'symlink',
-    stat.S_IFSOCK:'socket',
+    stat.S_IFDIR: 'directory',
+    stat.S_IFCHR: 'chardev',
+    stat.S_IFBLK: 'block',
+    stat.S_IFREG: 'file',
+    stat.S_IFIFO: 'fifo',
+    stat.S_IFLNK: 'symlink',
+    stat.S_IFSOCK: 'socket',
 }
 
 

=== modified file 'breezy/_static_tuple_py.py'
--- breezy/_static_tuple_py.py	2017-04-01 06:30:31 +0000
+++ breezy/_static_tuple_py.py	2017-11-12 14:04:35 +0000
@@ -58,7 +58,7 @@
 
     def __add__(self, other):
         """Concatenate self with other"""
-        return StaticTuple.from_sequence(tuple.__add__(self,other))
+        return StaticTuple.from_sequence(tuple.__add__(self, other))
 
     def as_tuple(self):
         return tuple(self)

=== modified file 'breezy/annotate.py'
--- breezy/annotate.py	2017-07-21 13:20:17 +0000
+++ breezy/annotate.py	2017-11-12 14:04:35 +0000
@@ -199,11 +199,11 @@
     for origin, text in annotations:
         text = text.rstrip('\r\n')
         if origin == last_origin:
-            (revno_str, author, date_str) = ('','','')
+            (revno_str, author, date_str) = ('', '', '')
         else:
             last_origin = origin
             if origin not in revisions:
-                (revno_str, author, date_str) = ('?','?','?')
+                (revno_str, author, date_str) = ('?', '?', '?')
             else:
                 revno_str = '.'.join(str(i) for i in
                                             revision_id_to_revno[origin])
@@ -343,7 +343,7 @@
     output_extend = output_lines.extend
     output_append = output_lines.append
     # We need to see if any of the unannotated lines match
-    plain_right_subset = [l for a,l in right_lines[start_right:end_right]]
+    plain_right_subset = [l for a, l in right_lines[start_right:end_right]]
     plain_child_subset = plain_child_lines[start_child:end_child]
     match_blocks = _get_matching_blocks(plain_right_subset, plain_child_subset)
 

=== modified file 'breezy/branch.py'
--- breezy/branch.py	2017-09-10 02:23:30 +0000
+++ breezy/branch.py	2017-11-12 14:04:35 +0000
@@ -1700,7 +1700,7 @@
             "basis revision. hooks MUST NOT modify this delta. "
             " future_tree is an in-memory tree obtained from "
             "CommitBuilder.revision_tree() and hooks MUST NOT modify this "
-            "tree.", (0,91))
+            "tree.", (0, 91))
         self.add_hook('post_commit',
             "Called in the bzr client after a commit has completed. "
             "post_commit is called with (local, master, old_revno, old_revid, "

=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2017-11-11 20:31:28 +0000
+++ breezy/builtins.py	2017-11-12 14:04:35 +0000
@@ -4904,7 +4904,7 @@
         Option('reverse', 'Reverse the order of revisions.'),
         Option('mine-only',
                'Display changes in the local branch only.'),
-        Option('this' , 'Same as --mine-only.'),
+        Option('this', 'Same as --mine-only.'),
         Option('theirs-only',
                'Display changes in the remote branch only.'),
         Option('other', 'Same as --theirs-only.'),

=== modified file 'breezy/bundle/apply_bundle.py'
--- breezy/bundle/apply_bundle.py	2017-06-08 23:30:31 +0000
+++ breezy/bundle/apply_bundle.py	2017-11-12 14:04:35 +0000
@@ -37,7 +37,7 @@
     try:
         real_revisions = bundle_reader.real_revisions
         for i, revision in enumerate(reversed(real_revisions)):
-            pb.update(gettext("Install revisions"),i, len(real_revisions))
+            pb.update(gettext("Install revisions"), i, len(real_revisions))
             if repository.has_revision(revision.revision_id):
                 continue
             cset_tree = bundle_reader.revision_tree(repository,

=== modified file 'breezy/bundle/bundle_data.py'
--- breezy/bundle/bundle_data.py	2017-06-08 23:30:31 +0000
+++ breezy/bundle/bundle_data.py	2017-11-12 14:04:35 +0000
@@ -535,7 +535,7 @@
         old_path = self._renamed.get(new_path)
         if old_path is not None:
             return old_path
-        dirname,basename = os.path.split(new_path)
+        dirname, basename = os.path.split(new_path)
         # dirname is not '' doesn't work, because
         # dirname may be a unicode entry, and is
         # requires the objects to be identical
@@ -564,7 +564,7 @@
             return new_path
         if new_path in self._renamed:
             return None
-        dirname,basename = os.path.split(old_path)
+        dirname, basename = os.path.split(old_path)
         if dirname != '':
             new_dir = self.new_path(dirname)
             if new_dir is None:

=== modified file 'breezy/bzr/chk_map.py'
--- breezy/bzr/chk_map.py	2017-06-11 13:48:12 +0000
+++ breezy/bzr/chk_map.py	2017-11-12 14:04:35 +0000
@@ -1012,7 +1012,7 @@
             raise AssertionError("_search_prefix should not be None")
         if not prefix.startswith(self._search_prefix):
             raise AssertionError("prefixes mismatch: %s must start with %s"
-                % (prefix,self._search_prefix))
+                % (prefix, self._search_prefix))
         if len(prefix) != len(self._search_prefix) + 1:
             raise AssertionError("prefix wrong length: len(%s) is not %d" %
                 (prefix, len(self._search_prefix) + 1))
@@ -1680,7 +1680,7 @@
         for record, _, prefix_refs, items in self._read_nodes_from_store(refs):
             # TODO: Use StaticTuple here?
             self._all_old_items.update(items)
-            refs = [r for _,r in prefix_refs if r not in all_old_chks]
+            refs = [r for _, r in prefix_refs if r not in all_old_chks]
             self._old_queue.extend(refs)
             all_old_chks.update(refs)
 

=== modified file 'breezy/bzr/dirstate.py'
--- breezy/bzr/dirstate.py	2017-08-26 13:58:53 +0000
+++ breezy/bzr/dirstate.py	2017-11-12 14:04:35 +0000
@@ -337,14 +337,14 @@
             b'a': 'absent',
             b'f': 'file',
             b'd': 'directory',
-            b'l':'symlink',
+            b'l': 'symlink',
             b'r': 'relocated',
             b't': 'tree-reference',
         }
     _stat_to_minikind = {
-        stat.S_IFDIR:b'd',
-        stat.S_IFREG:b'f',
-        stat.S_IFLNK:b'l',
+        stat.S_IFDIR: b'd',
+        stat.S_IFREG: b'f',
+        stat.S_IFLNK: b'l',
     }
     _to_yesno = {True: b'y', False: b'n'} # TODO profile the performance gain
      # of using int conversion rather than a dict here. AND BLAME ANDREW IF

=== modified file 'breezy/bzr/groupcompress_repo.py'
--- breezy/bzr/groupcompress_repo.py	2017-08-29 13:46:58 +0000
+++ breezy/bzr/groupcompress_repo.py	2017-11-12 14:04:35 +0000
@@ -1361,7 +1361,7 @@
     """
     text_keys_update = text_keys.update
     for record, items in interesting_nodes_iterable:
-        text_keys_update([bytes_to_text_key(b) for n,b in items])
+        text_keys_update([bytes_to_text_key(b) for n, b in items])
         yield record
 
 

=== modified file 'breezy/bzr/inventorytree.py'
--- breezy/bzr/inventorytree.py	2017-08-29 14:45:14 +0000
+++ breezy/bzr/inventorytree.py	2017-11-12 14:04:35 +0000
@@ -600,7 +600,7 @@
                             things_to_add.append((subp, sub_invp, None, this_ie))
 
 
-class InventoryRevisionTree(RevisionTree,InventoryTree):
+class InventoryRevisionTree(RevisionTree, InventoryTree):
 
     def __init__(self, repository, inv, revision_id):
         RevisionTree.__init__(self, repository, revision_id)

=== modified file 'breezy/bzr/remote.py'
--- breezy/bzr/remote.py	2017-08-29 13:46:58 +0000
+++ breezy/bzr/remote.py	2017-11-12 14:04:35 +0000
@@ -264,7 +264,7 @@
             response = client.call('BzrDirFormat.initialize_ex_1.16',
                 request_network_name, path, *args)
         except errors.UnknownSmartMethod:
-            client._medium._remember_remote_is_before((1,16))
+            client._medium._remember_remote_is_before((1, 16))
             local_dir_format = _mod_bzrdir.BzrDirMetaFormat1()
             self._supply_sub_formats_to(local_dir_format)
             return local_dir_format.initialize_on_transport_ex(transport,

=== modified file 'breezy/bzr/versionedfile.py'
--- breezy/bzr/versionedfile.py	2017-11-11 15:06:09 +0000
+++ breezy/bzr/versionedfile.py	2017-11-12 14:04:35 +0000
@@ -1363,7 +1363,7 @@
     def get_sha1s(self, keys):
         """See VersionedFiles.get_sha1s()."""
         sha1s = {}
-        for prefix,suffixes, vf in self._iter_keys_vf(keys):
+        for prefix, suffixes, vf in self._iter_keys_vf(keys):
             vf_sha1s = vf.get_sha1s(suffixes)
             for suffix, sha1 in viewitems(vf_sha1s):
                 sha1s[prefix + (suffix,)] = sha1

=== modified file 'breezy/bzr/vf_repository.py'
--- breezy/bzr/vf_repository.py	2017-08-29 13:46:58 +0000
+++ breezy/bzr/vf_repository.py	2017-11-12 14:04:35 +0000
@@ -352,9 +352,9 @@
                                 change[3].revision]
                             parent_entries[change[2]] = {
                                 # basis parent
-                                basis_entry.revision:basis_entry,
+                                basis_entry.revision: basis_entry,
                                 # this parent 
-                                change[3].revision:change[3],
+                                change[3].revision: change[3],
                                 }
                         else:
                             merged_ids[change[2]] = [change[3].revision]
@@ -1565,7 +1565,7 @@
             elif revision_id is None:
                 raise ValueError('get_parent_map(None) is not valid')
             else:
-                query_keys.append((revision_id ,))
+                query_keys.append((revision_id,))
         for (revision_id,), parent_keys in viewitems(
                 self.revisions.get_parent_map(query_keys)):
             if parent_keys:

=== modified file 'breezy/bzr/workingtree.py'
--- breezy/bzr/workingtree.py	2017-09-10 02:23:30 +0000
+++ breezy/bzr/workingtree.py	2017-11-12 14:04:35 +0000
@@ -92,7 +92,7 @@
 CONFLICT_HEADER_1 = b"BZR conflict list format 1"
 
 
-class InventoryWorkingTree(WorkingTree,MutableInventoryTree):
+class InventoryWorkingTree(WorkingTree, MutableInventoryTree):
     """Base class for working trees that are inventory-oriented.
 
     The inventory is held in the `Branch` working-inventory, and the
@@ -1179,7 +1179,7 @@
                 from_tail = osutils.splitpath(from_rel)[-1]
                 from_inv, from_id = self._path2inv_file_id(from_rel)
                 if from_id is None:
-                    raise errors.BzrMoveFailedError(from_rel,to_dir,
+                    raise errors.BzrMoveFailedError(from_rel, to_dir,
                         errors.NotVersionedError(path=from_rel))
 
                 from_entry = from_inv[from_id]
@@ -1272,7 +1272,7 @@
             # check if the target changed directory and if the target directory is
             # versioned
             if to_dir_id is None:
-                raise errors.BzrMoveFailedError(from_rel,to_rel,
+                raise errors.BzrMoveFailedError(from_rel, to_rel,
                     errors.NotVersionedError(path=to_dir))
 
             # all checks done. now we can continue with our actual work
@@ -1321,7 +1321,7 @@
 
             # check the inventory for source and destination
             if from_id is None:
-                raise errors.BzrMoveFailedError(from_rel,to_rel,
+                raise errors.BzrMoveFailedError(from_rel, to_rel,
                     errors.NotVersionedError(path=from_rel))
             if to_id is not None:
                 allowed = False
@@ -1333,14 +1333,14 @@
                             rename_entry.change_id = True
                             allowed = True
                 if not allowed:
-                    raise errors.BzrMoveFailedError(from_rel,to_rel,
+                    raise errors.BzrMoveFailedError(from_rel, to_rel,
                         errors.AlreadyVersionedError(path=to_rel))
 
             # try to determine the mode for rename (only change inv or change
             # inv and file system)
             if after:
                 if not self.has_filename(to_rel):
-                    raise errors.BzrMoveFailedError(from_id,to_rel,
+                    raise errors.BzrMoveFailedError(from_id, to_rel,
                         errors.NoSuchFile(path=to_rel,
                         extra="New file has not been created yet"))
                 only_change_inv = True

=== modified file 'breezy/bzr/workingtree_4.py'
--- breezy/bzr/workingtree_4.py	2017-08-29 21:03:58 +0000
+++ breezy/bzr/workingtree_4.py	2017-11-12 14:04:35 +0000
@@ -683,11 +683,11 @@
             to_block = state._dirblocks[to_block_index]
             to_abs = self.abspath(to_dir)
             if not isdir(to_abs):
-                raise errors.BzrMoveFailedError('',to_dir,
+                raise errors.BzrMoveFailedError('', to_dir,
                     errors.NotADirectory(to_abs))
 
             if to_entry[1][0][0] != 'd':
-                raise errors.BzrMoveFailedError('',to_dir,
+                raise errors.BzrMoveFailedError('', to_dir,
                     errors.NotADirectory(to_abs))
 
             if self._inventory is not None:
@@ -733,7 +733,7 @@
                 from_dirname, from_tail_utf8 = osutils.split(from_rel_utf8)
                 from_entry = self._get_entry(path=from_rel)
                 if from_entry == (None, None):
-                    raise errors.BzrMoveFailedError(from_rel,to_dir,
+                    raise errors.BzrMoveFailedError(from_rel, to_dir,
                         errors.NotVersionedError(path=from_rel))
 
                 from_id = from_entry[0][2]

=== modified file 'breezy/bzr/xml_serializer.py'
--- breezy/bzr/xml_serializer.py	2017-06-11 13:48:12 +0000
+++ breezy/bzr/xml_serializer.py	2017-11-12 14:04:35 +0000
@@ -158,11 +158,11 @@
 
 
 _xml_escape_map = {
-    "&":'&',
-    "'":"'", # FIXME: overkill
-    "\"":""",
-    "<":"&lt;",
-    ">":"&gt;",
+    "&": '&amp;',
+    "'": "&apos;", # FIXME: overkill
+    "\"": "&quot;",
+    "<": "&lt;",
+    ">": "&gt;",
     }
 
 

=== modified file 'breezy/clean_tree.py'
--- breezy/clean_tree.py	2017-08-26 13:58:53 +0000
+++ breezy/clean_tree.py	2017-11-12 14:04:35 +0000
@@ -83,12 +83,12 @@
             try:
                 controldir.ControlDir.open(path)
             except errors.NotBranchError:
-                result.append((path,subp))
+                result.append((path, subp))
             else:
                 # TODO may be we need to notify user about skipped directories?
                 pass
         else:
-            result.append((path,subp))
+            result.append((path, subp))
     return result
 
 

=== modified file 'breezy/commands.py'
--- breezy/commands.py	2017-08-29 21:07:17 +0000
+++ breezy/commands.py	2017-11-12 14:04:35 +0000
@@ -187,7 +187,7 @@
 
 
 def _unsquish_command_name(cmd):
-    return cmd[4:].replace('_','-')
+    return cmd[4:].replace('_', '-')
 
 
 def _register_builtin_commands():
@@ -559,7 +559,7 @@
             doc = gettext("No help for this command.")
 
         # Extract the summary (purpose) and sections out from the text
-        purpose,sections,order = self._get_help_parts(doc)
+        purpose, sections, order = self._get_help_parts(doc)
 
         # If a custom usage section was provided, use it
         if 'Usage' in sections:
@@ -670,14 +670,14 @@
         summary = lines.pop(0)
         sections = {}
         order = []
-        label,section = None,''
+        label, section = None, ''
         for line in lines:
             if line.startswith(':') and line.endswith(':') and len(line) > 2:
                 save_section(sections, order, label, section)
-                label,section = line[1:-1],''
+                label, section = line[1:-1], ''
             elif (label is not None) and len(line) > 1 and not line[0].isspace():
                 save_section(sections, order, label, section)
-                label,section = None,line
+                label, section = None, line
             else:
                 if len(section) > 0:
                     section += '\n' + line

=== modified file 'breezy/delta.py'
--- breezy/delta.py	2017-05-24 20:47:06 +0000
+++ breezy/delta.py	2017-11-12 14:04:35 +0000
@@ -314,9 +314,9 @@
     :param reporter: The _ChangeReporter that will report the changes.
     """
     versioned_change_map = {
-        (True, True)  : 'unchanged',
-        (True, False) : 'removed',
-        (False, True) : 'added',
+        (True, True): 'unchanged',
+        (True, False): 'removed',
+        (False, True): 'added',
         (False, False): 'unversioned',
         }
     for (file_id, path, content_change, versioned, parent_id, name, kind,

=== modified file 'breezy/diff.py'
--- breezy/diff.py	2017-08-26 13:58:53 +0000
+++ breezy/diff.py	2017-11-12 14:04:35 +0000
@@ -237,7 +237,7 @@
             diffcmd.extend(diff_opts)
 
         pipe = _spawn_external_diff(diffcmd, capture_errors=True)
-        out,err = pipe.communicate()
+        out, err = pipe.communicate()
         rc = pipe.returncode
 
         # internal_diff() adds a trailing newline, add one here for consistency
@@ -699,7 +699,7 @@
         except errors.BinaryFile:
             self.to_file.write(
                   ("Binary files %s and %s differ\n" %
-                  (from_label, to_label)).encode(self.path_encoding,'replace'))
+                  (from_label, to_label)).encode(self.path_encoding, 'replace'))
         return self.CHANGED
 
 

=== modified file 'breezy/doc_generate/autodoc_man.py'
--- breezy/doc_generate/autodoc_man.py	2017-07-30 16:59:50 +0000
+++ breezy/doc_generate/autodoc_man.py	2017-11-12 14:04:35 +0000
@@ -62,10 +62,10 @@
 
 def man_escape(string):
     """Escapes strings for man page compatibility"""
-    result = string.replace("\\","\\\\")
-    result = result.replace("`","\\'")
-    result = result.replace("'","\\*(Aq")
-    result = result.replace("-","\\-")
+    result = string.replace("\\", "\\\\")
+    result = result.replace("`", "\\'")
+    result = result.replace("'", "\\*(Aq")
+    result = result.replace("-", "\\-")
     return result
 
 

=== modified file 'breezy/doc_generate/autodoc_rstx.py'
--- breezy/doc_generate/autodoc_rstx.py	2017-06-02 21:28:05 +0000
+++ breezy/doc_generate/autodoc_rstx.py	2017-11-12 14:04:35 +0000
@@ -41,8 +41,8 @@
     tt = breezy.osutils.gmtime()
     params = \
            { "brzcmd": options.brz_name,
-             "datestamp": time.strftime("%Y-%m-%d",tt),
-             "timestamp": time.strftime("%Y-%m-%d %H:%M:%S +0000",tt),
+             "datestamp": time.strftime("%Y-%m-%d", tt),
+             "timestamp": time.strftime("%Y-%m-%d %H:%M:%S +0000", tt),
              "version": breezy.__version__,
              }
     nominated_filename = getattr(options, 'filename', None)

=== modified file 'breezy/filters/__init__.py'
--- breezy/filters/__init__.py	2017-05-30 19:16:23 +0000
+++ breezy/filters/__init__.py	2017-11-12 14:04:35 +0000
@@ -66,7 +66,7 @@
         self.writer = writer
 
     def __repr__(self):
-        return "reader: %s, writer: %s" % (self.reader,self.writer)
+        return "reader: %s, writer: %s" % (self.reader, self.writer)
 
 
 class ContentFilterContext(object):

=== modified file 'breezy/globbing.py'
--- breezy/globbing.py	2017-10-27 00:18:42 +0000
+++ breezy/globbing.py	2017-11-12 14:04:35 +0000
@@ -191,15 +191,15 @@
     pattern_types = [ "extension", "basename", "fullpath" ]
 
     pattern_info = {
-        "extension" : {
+        "extension": {
             "translator" : _sub_extension,
             "prefix" : r'(?:.*/)?(?!.*/)(?:.*\.)'
         },
-        "basename" : {
+        "basename": {
             "translator" : _sub_basename,
             "prefix" : r'(?:.*/)?(?!.*/)'
         },
-        "fullpath" : {
+        "fullpath": {
             "translator" : _sub_fullpath,
             "prefix" : r''
         },
@@ -208,9 +208,9 @@
     def __init__(self, patterns):
         self._regex_patterns = []
         pattern_lists = {
-            "extension" : [],
-            "basename" : [],
-            "fullpath" : [],
+            "extension": [],
+            "basename": [],
+            "fullpath": [],
         }
         for pat in patterns:
             pat = normalize_pattern(pat)
@@ -302,7 +302,7 @@
     that apply under paths specified by '!' exception patterns.
     """
     
-    def __init__(self,patterns):
+    def __init__(self, patterns):
         ignores = [[], [], []]
         for p in patterns:
             if p.startswith(u'!!'):

=== modified file 'breezy/graph.py'
--- breezy/graph.py	2017-06-05 20:48:31 +0000
+++ breezy/graph.py	2017-11-12 14:04:35 +0000
@@ -1713,7 +1713,7 @@
         self._graph.add_node((revision,), [(p,) for p in parents])
 
 
-_counters = [0,0,0,0,0,0,0]
+_counters = [0, 0, 0, 0, 0, 0, 0]
 try:
     from ._known_graph_pyx import KnownGraph
 except ImportError as e:

=== modified file 'breezy/help_topics/__init__.py'
--- breezy/help_topics/__init__.py	2017-07-31 00:12:06 +0000
+++ breezy/help_topics/__init__.py	2017-11-12 14:04:35 +0000
@@ -195,7 +195,7 @@
         else:
             # Extract out the top line summary from the body and
             # clean-up the unwanted whitespace
-            summary,doc = doc.split("\n", 1)
+            summary, doc = doc.split("\n", 1)
             #doc = indent_re.sub('', doc)
             while (doc[-2:] == '\n\n' or doc[-1:] == ' '):
                 doc = doc[:-1]
@@ -221,7 +221,7 @@
        help_text = line_with_indent.join(help_lines)
        return "%-20s%s\n" % (proto, help_text)
 
-    def sort_func(a,b):
+    def sort_func(a, b):
         a1 = a[:a.rfind("://")]
         b1 = b[:b.rfind("://")]
         if a1>b1:

=== modified file 'breezy/i18n.py'
--- breezy/i18n.py	2017-06-11 00:27:48 +0000
+++ breezy/i18n.py	2017-11-12 14:04:35 +0000
@@ -161,7 +161,7 @@
 
 
 def _check_win32_locale():
-    for i in ('LANGUAGE','LC_ALL','LC_MESSAGES','LANG'):
+    for i in ('LANGUAGE', 'LC_ALL', 'LC_MESSAGES', 'LANG'):
         if os.environ.get(i):
             break
     else:
@@ -196,7 +196,7 @@
             return lang
     if sys.platform == 'win32':
         _check_win32_locale()
-    for i in ('LANGUAGE','LC_ALL','LC_MESSAGES','LANG'):
+    for i in ('LANGUAGE', 'LC_ALL', 'LC_MESSAGES', 'LANG'):
         lang = os.environ.get(i)
         if lang:
             return lang

=== modified file 'breezy/log.py'
--- breezy/log.py	2017-10-28 13:11:58 +0000
+++ breezy/log.py	2017-11-12 14:04:35 +0000
@@ -825,9 +825,9 @@
     """Adjust depths upwards so the top level is 0."""
     # If either the first or last revision have a merge_depth of 0, we're done
     if view_revisions and view_revisions[0][2] and view_revisions[-1][2]:
-        min_depth = min([d for r,n,d in view_revisions])
+        min_depth = min([d for r, n, d in view_revisions])
         if min_depth != 0:
-            view_revisions = [(r,n,d-min_depth) for r,n,d in view_revisions]
+            view_revisions = [(r, n, d-min_depth) for r, n, d in view_revisions]
     return view_revisions
 
 
@@ -906,7 +906,7 @@
                }
     strings[''] = [item for inner_list in strings.values()
                    for item in inner_list]
-    for (k,v) in searchRE:
+    for (k, v) in searchRE:
         if k in strings and not _match_any_filter(strings[k], v):
             return False
     return True
@@ -1769,16 +1769,16 @@
                                show_offset=False)
         committer_str = self.authors(revision.rev, 'first', sep=', ')
         committer_str = committer_str.replace(' <', '  <')
-        to_file.write('%s  %s\n\n' % (date_str,committer_str))
+        to_file.write('%s  %s\n\n' % (date_str, committer_str))
 
         if revision.delta is not None and revision.delta.has_changed():
             for c in revision.delta.added + revision.delta.removed + revision.delta.modified:
                 path, = c[:1]
                 to_file.write('\t* %s:\n' % (path,))
             for c in revision.delta.renamed:
-                oldpath,newpath = c[:2]
+                oldpath, newpath = c[:2]
                 # For renamed files, show both the old and the new path
-                to_file.write('\t* %s:\n\t* %s:\n' % (oldpath,newpath))
+                to_file.write('\t* %s:\n\t* %s:\n' % (oldpath, newpath))
             to_file.write('\n')
 
         if not revision.rev.message:

=== modified file 'breezy/missing.py'
--- breezy/missing.py	2017-06-24 13:32:35 +0000
+++ breezy/missing.py	2017-11-12 14:04:35 +0000
@@ -206,5 +206,5 @@
 
 
 def sorted_revisions(revisions, history_map):
-    revisions = sorted([(history_map[r],r) for r in revisions])
+    revisions = sorted([(history_map[r], r) for r in revisions])
     return revisions

=== modified file 'breezy/osutils.py'
--- breezy/osutils.py	2017-11-11 15:06:09 +0000
+++ breezy/osutils.py	2017-11-12 14:04:35 +0000
@@ -593,7 +593,7 @@
         F = realpath
     else:
         F = abspath
-    [p,e] = os.path.split(f)
+    [p, e] = os.path.split(f)
     if e == "" or e == "." or e == "..":
         return F(f)
     else:
@@ -1948,9 +1948,9 @@
         link_to = os.readlink(source)
         os.symlink(link_to, dest)
 
-    real_handlers = {'file':shutil.copy2,
-                     'symlink':copy_link,
-                     'directory':copy_dir,
+    real_handlers = {'file': shutil.copy2,
+                     'symlink': copy_link,
+                     'directory': copy_dir,
                     }
     real_handlers.update(handlers)
 
@@ -1992,7 +1992,7 @@
 
     This can be used to sort paths in the same way that walkdirs does.
     """
-    return (dirname(path) , path)
+    return (dirname(path), path)
 
 
 def compare_paths_prefix_order(path_a, path_b):

=== modified file 'breezy/patiencediff.py'
--- breezy/patiencediff.py	2017-05-22 00:56:52 +0000
+++ breezy/patiencediff.py	2017-11-12 14:04:35 +0000
@@ -82,7 +82,7 @@
         tofiledate = '\t' + str(tofiledate)
 
     started = False
-    for group in sequencematcher(None,a,b).get_grouped_opcodes(n):
+    for group in sequencematcher(None, a, b).get_grouped_opcodes(n):
         if not started:
             yield '--- %s%s%s' % (fromfile, fromfiledate, lineterm)
             yield '+++ %s%s%s' % (tofile, tofiledate, lineterm)

=== modified file 'breezy/plugins/fastimport/branch_updater.py'
--- breezy/plugins/fastimport/branch_updater.py	2017-08-26 13:58:53 +0000
+++ breezy/plugins/fastimport/branch_updater.py	2017-11-12 14:04:35 +0000
@@ -119,7 +119,7 @@
                 location = dir_policy(name, ref_name)
                 try:
                     br = self.make_branch(location)
-                    branch_tips.append((br,tip))
+                    branch_tips.append((br, tip))
                     continue
                 except errors.BzrError, ex:
                     show_error("ERROR: failed to create branch %s: %s",
@@ -168,7 +168,7 @@
         if self.tags:
             graph = self.repo.get_graph()
             ancestry = [r for (r, ps) in graph.iter_ancestry([last_rev_id]) if ps is not None]
-            for tag,rev in self.tags.items():
+            for tag, rev in self.tags.items():
                 if rev in ancestry:
                     my_tags[tag] = rev
             if my_tags:

=== modified file 'breezy/plugins/fastimport/tests/test_branch_mapper.py'
--- breezy/plugins/fastimport/tests/test_branch_mapper.py	2017-05-23 23:21:16 +0000
+++ breezy/plugins/fastimport/tests/test_branch_mapper.py	2017-11-12 14:04:35 +0000
@@ -66,6 +66,6 @@
             'refs/remotes/origin/trunk':    'git-trunk.remote',
             'refs/heads/git-trunk':         'git-git-trunk',
             'refs/tags/git-trunk':          'git-git-trunk.tag',
-            'refs/remotes/origin/git-trunk':'git-git-trunk.remote',
+            'refs/remotes/origin/git-trunk': 'git-git-trunk.remote',
             }.items():
             self.assertEqual(m.git_to_bzr(git), bzr)

=== modified file 'breezy/plugins/grep/grep.py'
--- breezy/plugins/grep/grep.py	2017-10-28 13:11:58 +0000
+++ breezy/plugins/grep/grep.py	2017-11-12 14:04:35 +0000
@@ -152,7 +152,7 @@
                 self.get_writer = self._get_writer_fixed_highlighted
             else:
                 flags = opts.patternc.flags
-                self._sub = re.compile(pat.join(("((?:",")+)")), flags).sub
+                self._sub = re.compile(pat.join(("((?:", ")+)")), flags).sub
                 self._highlight = color_string("\\1", FG.BOLD_RED)
                 self.get_writer = self._get_writer_regexp_highlighted
         else:
@@ -403,7 +403,7 @@
     # setup relpath to open files relative to cwd
     rpath = relpath
     if relpath:
-        rpath = osutils.pathjoin('..',relpath)
+        rpath = osutils.pathjoin('..', relpath)
 
     from_dir = osutils.pathjoin(relpath, path)
     if opts.from_root:
@@ -548,7 +548,7 @@
                 self.get_writer = self._get_writer_fixed_highlighted
             else:
                 flags = opts.patternc.flags
-                self._sub = re.compile(pat.join(("((?:",")+)")), flags).sub
+                self._sub = re.compile(pat.join(("((?:", ")+)")), flags).sub
                 self._highlight = color_string("\\1", FG.BOLD_RED)
                 self.get_writer = self._get_writer_regexp_highlighted
             path_start = FG.MAGENTA

=== modified file 'breezy/plugins/stats/cmds.py'
--- breezy/plugins/stats/cmds.py	2017-08-26 23:50:59 +0000
+++ breezy/plugins/stats/cmds.py	2017-11-12 14:04:35 +0000
@@ -370,7 +370,7 @@
         pb = ui.ui_factory.nested_progress_bar()
         try:
             iterator = zip(revs, repository.get_deltas_for_revisions(revs))
-            for i, (rev,delta) in enumerate(iterator):
+            for i, (rev, delta) in enumerate(iterator):
                 pb.update("analysing revisions", i, len(revs))
                 # Don't count merges
                 if len(rev.parent_ids) > 1:

=== modified file 'breezy/plugins/upload/cmds.py'
--- breezy/plugins/upload/cmds.py	2017-08-26 23:50:59 +0000
+++ breezy/plugins/upload/cmds.py	2017-11-12 14:04:35 +0000
@@ -275,7 +275,7 @@
 
         stamp = '.tmp.%.9f.%d.%d' % (time.time(),
                                      os.getpid(),
-                                     random.randint(0,0x7FFFFFFF))
+                                     random.randint(0, 0x7FFFFFFF))
         if not self.quiet:
             self.outf.write('Renaming %s to %s\n' % (old_relpath, new_relpath))
         self._up_rename(old_relpath, stamp)

=== modified file 'breezy/plugins/weave_fmt/test_bzrdir.py'
--- breezy/plugins/weave_fmt/test_bzrdir.py	2017-06-20 21:55:37 +0000
+++ breezy/plugins/weave_fmt/test_bzrdir.py	2017-11-12 14:04:35 +0000
@@ -552,7 +552,7 @@
 
     def test_bind_format_6_bzrdir(self):
         # bind on a format 6 bzrdir should error
-        out,err = self.run_bzr('bind ../master', retcode=3)
+        out, err = self.run_bzr('bind ../master', retcode=3)
         self.assertEqual('', out)
         # TODO: jam 20060427 Probably something like this really should
         #       print out the actual path, rather than the URL
@@ -562,7 +562,7 @@
 
     def test_unbind_format_6_bzrdir(self):
         # bind on a format 6 bzrdir should error
-        out,err = self.run_bzr('unbind', retcode=3)
+        out, err = self.run_bzr('unbind', retcode=3)
         self.assertEqual('', out)
         cwd = urlutils.local_path_to_url(getcwd())
         self.assertEqual('brz: ERROR: To use this feature you must '

=== modified file 'breezy/repository.py'
--- breezy/repository.py	2017-08-29 13:46:58 +0000
+++ breezy/repository.py	2017-11-12 14:04:35 +0000
@@ -1056,7 +1056,7 @@
             elif revision_id is None:
                 raise ValueError('get_parent_map(None) is not valid')
             else:
-                query_keys.append((revision_id ,))
+                query_keys.append((revision_id,))
         vf = self.revisions.without_fallbacks()
         for (revision_id,), parent_keys in viewitems(
                 vf.get_parent_map(query_keys)):

=== modified file 'breezy/revisionspec.py'
--- breezy/revisionspec.py	2017-08-26 13:58:53 +0000
+++ breezy/revisionspec.py	2017-11-12 14:04:35 +0000
@@ -701,7 +701,7 @@
                     else:
                         second = 0
                 else:
-                    hour, minute, second = 0,0,0
+                    hour, minute, second = 0, 0, 0
             except ValueError:
                 raise errors.InvalidRevisionSpec(self.user_spec,
                                                  branch, 'invalid date')

=== modified file 'breezy/tag.py'
--- breezy/tag.py	2017-08-26 13:58:53 +0000
+++ breezy/tag.py	2017-11-12 14:04:35 +0000
@@ -359,8 +359,8 @@
     :param tags: List of tuples with tag name and revision id.
     """
     def natural_sort_key(tag):
-        return [f(s) for f,s in
-                zip(itertools.cycle((unicode.lower,int)),
+        return [f(s) for f, s in
+                zip(itertools.cycle((unicode.lower, int)),
                                     re.split('([0-9]+)', tag[0]))]
     tags.sort(key=natural_sort_key)
 

=== modified file 'breezy/tests/__init__.py'
--- breezy/tests/__init__.py	2017-10-07 17:52:11 +0000
+++ breezy/tests/__init__.py	2017-11-12 14:04:35 +0000
@@ -1453,7 +1453,7 @@
         except excClass as e:
             return e
         else:
-            if getattr(excClass,'__name__', None) is not None:
+            if getattr(excClass, '__name__', None) is not None:
                 excName = excClass.__name__
             else:
                 excName = str(excClass)
@@ -1474,7 +1474,7 @@
         except excClass as e:
             return e
         else:
-            if getattr(excClass,'__name__', None) is not None:
+            if getattr(excClass, '__name__', None) is not None:
                 excName = excClass.__name__
             else:
                 # probably a tuple
@@ -2874,7 +2874,7 @@
             tree = workingtree.WorkingTree.open(root_path)
         if not isinstance(path, (str, text_type)):
             for p in path:
-                self.assertNotInWorkingTree(p,tree=tree)
+                self.assertNotInWorkingTree(p, tree=tree)
         else:
             self.assertIs(tree.path2id(path), None, path+' in working tree.')
 

=== modified file 'breezy/tests/blackbox/test_ancestry.py'
--- breezy/tests/blackbox/test_ancestry.py	2017-06-10 00:17:06 +0000
+++ breezy/tests/blackbox/test_ancestry.py	2017-11-12 14:04:35 +0000
@@ -24,18 +24,18 @@
         a_wt = self.make_branch_and_tree('A')
         self.build_tree_contents([('A/foo', '1111\n')])
         a_wt.add('foo')
-        a_wt.commit('added foo',rev_id='A1')
+        a_wt.commit('added foo', rev_id='A1')
 
         b_wt = a_wt.controldir.sprout('B').open_workingtree()
         self.build_tree_contents([('B/foo', '1111\n22\n')])
-        b_wt.commit('modified B/foo',rev_id='B1')
+        b_wt.commit('modified B/foo', rev_id='B1')
 
         self.build_tree_contents([('A/foo', '000\n1111\n')])
-        a_wt.commit('modified A/foo',rev_id='A2')
+        a_wt.commit('modified A/foo', rev_id='A2')
 
         a_wt.merge_from_branch(b_wt.branch, b_wt.last_revision(),
             b_wt.branch.get_rev_id(1))
-        a_wt.commit('merged B into A',rev_id='A3')
+        a_wt.commit('merged B into A', rev_id='A3')
         return a_wt, b_wt
 
     def _check_ancestry(self, location='', result=None):

=== modified file 'breezy/tests/blackbox/test_branch.py'
--- breezy/tests/blackbox/test_branch.py	2017-08-07 19:15:59 +0000
+++ breezy/tests/blackbox/test_branch.py	2017-11-12 14:04:35 +0000
@@ -91,7 +91,7 @@
         out, err = self.run_bzr('branches b')
         self.assertEqual("  orig\n  thiswasa\n", out)
         self.assertEqual('', err)
-        out,err = self.run_bzr('branch a file:b,branch=orig', retcode=3)
+        out, err = self.run_bzr('branch a file:b,branch=orig', retcode=3)
         self.assertEqual('', out)
         self.assertEqual(
             'brz: ERROR: Already a branch: "file:b,branch=orig".\n', err)
@@ -296,7 +296,7 @@
         self.build_tree_contents([('b/hello', 'bar')])  # different content
         self.build_tree_contents([('b/goodbye', 'baz')])# same content
         # fails without --use-existing-dir
-        out,err = self.run_bzr('branch a b', retcode=3)
+        out, err = self.run_bzr('branch a b', retcode=3)
         self.assertEqual('', out)
         self.assertEqual('brz: ERROR: Target directory "b" already exists.\n',
             err)
@@ -306,7 +306,7 @@
         self.assertPathExists('b/hello.moved')
         self.assertPathDoesNotExist('b/godbye.moved')
         # we can't branch into branch
-        out,err = self.run_bzr('branch a b --use-existing-dir', retcode=3)
+        out, err = self.run_bzr('branch a b --use-existing-dir', retcode=3)
         self.assertEqual('', out)
         self.assertEqual('brz: ERROR: Already a branch: "b".\n', err)
 

=== modified file 'breezy/tests/blackbox/test_checkout.py'
--- breezy/tests/blackbox/test_checkout.py	2017-06-10 16:40:42 +0000
+++ breezy/tests/blackbox/test_checkout.py	2017-11-12 14:04:35 +0000
@@ -71,7 +71,7 @@
         self.assertPathDoesNotExist('checkout/added_in_2')
 
     def test_checkout_light_dash_r(self):
-        out, err = self.run_bzr(['checkout','--lightweight', '-r', '-2',
+        out, err = self.run_bzr(['checkout', '--lightweight', '-r', '-2',
             'branch', 'checkout'])
         # the working tree should now be at revision '1' with the content
         # from 1.

=== modified file 'breezy/tests/blackbox/test_commit.py'
--- breezy/tests/blackbox/test_commit.py	2017-11-11 20:41:36 +0000
+++ breezy/tests/blackbox/test_commit.py	2017-11-12 14:04:35 +0000
@@ -46,7 +46,7 @@
         # If forced, it should succeed, but this is not tested here.
         self.make_branch_and_tree('.')
         self.build_tree(['hello.txt'])
-        out,err = self.run_bzr('commit -m empty', retcode=3)
+        out, err = self.run_bzr('commit -m empty', retcode=3)
         self.assertEqual('', out)
         # Two ugly bits here.
         # 1) We really don't want 'aborting commit write group' anymore.
@@ -108,7 +108,7 @@
         tree = self.make_branch_and_tree('.')
         self.build_tree(['hello.txt'])
         tree.add("hello.txt")
-        out,err = self.run_bzr('commit -m added')
+        out, err = self.run_bzr('commit -m added')
         self.assertEqual('', out)
         self.assertContainsRe(err, '^Committing to: .*\n'
                               'added hello.txt\n'
@@ -228,7 +228,7 @@
         wt = ControlDir.create_standalone_workingtree('.')
         self.build_tree(['hello.txt', 'extra.txt'])
         wt.add(['hello.txt'])
-        out,err = self.run_bzr('commit -m added')
+        out, err = self.run_bzr('commit -m added')
         self.assertEqual('', out)
         self.assertContainsRe(err, '^Committing to: .*\n'
                               'added hello\.txt\n'
@@ -241,7 +241,7 @@
         tree.add('unchanged.txt')
         self.run_bzr('commit -m unchanged unchanged.txt')
         tree.add("hello.txt")
-        out,err = self.run_bzr('commit -m added')
+        out, err = self.run_bzr('commit -m added')
         self.assertEqual('', out)
         self.assertContainsRe(err, '^Committing to: .*\n'
                               'added hello\.txt\n'
@@ -910,7 +910,7 @@
         tree.add([u'abc\xa7/', u'abc\xa7/foo'])
         tree.commit('checkin')
 
-        tree.rename_one(u'abc\xa7','abc')
+        tree.rename_one(u'abc\xa7', 'abc')
 
         self.run_bzr('ci -m "non-ascii mv"')
 

=== modified file 'breezy/tests/blackbox/test_exceptions.py'
--- breezy/tests/blackbox/test_exceptions.py	2017-06-14 22:34:05 +0000
+++ breezy/tests/blackbox/test_exceptions.py	2017-11-12 14:04:35 +0000
@@ -74,7 +74,7 @@
     def test_nonascii_optparse(self):
         """Reasonable error raised when non-ascii in option name"""
         error_re = 'Only ASCII permitted in option names'
-        out = self.run_bzr_error([error_re], ['st',u'-\xe4'])
+        out = self.run_bzr_error([error_re], ['st', u'-\xe4'])
 
 
 class TestObsoleteRepoFormat(RepositoryFormat2a):

=== modified file 'breezy/tests/blackbox/test_ignore.py'
--- breezy/tests/blackbox/test_ignore.py	2017-06-10 01:39:46 +0000
+++ breezy/tests/blackbox/test_ignore.py	2017-11-12 14:04:35 +0000
@@ -94,7 +94,7 @@
     def test_ignore_multiple_arguments(self):
         """'ignore' works with multiple arguments"""
         tree = self.make_branch_and_tree('.')
-        self.build_tree(['a','b','c','d'])
+        self.build_tree(['a', 'b', 'c', 'd'])
         self.assertEqual(list(tree.unknowns()), ['a', 'b', 'c', 'd'])
         self.run_bzr('ignore a b c')
         self.assertEqual(list(tree.unknowns()), ['d'])
@@ -116,7 +116,7 @@
 
     def test_ignore_versioned_file(self):
         tree = self.make_branch_and_tree('.')
-        self.build_tree(['a','b'])
+        self.build_tree(['a', 'b'])
         tree.add('a')
 
         # test a single versioned file

=== modified file 'breezy/tests/blackbox/test_log.py'
--- breezy/tests/blackbox/test_log.py	2017-07-04 20:03:11 +0000
+++ breezy/tests/blackbox/test_log.py	2017-11-12 14:04:35 +0000
@@ -328,7 +328,7 @@
     def test_log_revno_n_path_correct_order(self):
         self.make_linear_branch('branch2')
         self.assertLogRevnos(['-rrevno:1:branch2..revno:3:branch2'],
-                             ['3', '2','1'])
+                             ['3', '2', '1'])
 
     def test_log_revno_n_path(self):
         self.make_linear_branch('branch2')
@@ -718,13 +718,13 @@
         wt.commit(message=message)
         # check that command won't fail with unicode error
         # don't care about exact output because we have other tests for this
-        out,err = self.run_bzr('log -p --long')
-        self.assertNotEqual('', out)
-        self.assertEqual('', err)
-        out,err = self.run_bzr('log -p --short')
-        self.assertNotEqual('', out)
-        self.assertEqual('', err)
-        out,err = self.run_bzr('log -p --line')
+        out, err = self.run_bzr('log -p --long')
+        self.assertNotEqual('', out)
+        self.assertEqual('', err)
+        out, err = self.run_bzr('log -p --short')
+        self.assertNotEqual('', out)
+        self.assertEqual('', err)
+        out, err = self.run_bzr('log -p --line')
         self.assertNotEqual('', out)
         self.assertEqual('', err)
 

=== modified file 'breezy/tests/blackbox/test_logformats.py'
--- breezy/tests/blackbox/test_logformats.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/blackbox/test_logformats.py	2017-11-12 14:04:35 +0000
@@ -41,7 +41,7 @@
                 self.fail("%s exists" % conf_path)
 
         config.ensure_config_dir_exists()
-        f = open(conf_path,'wb')
+        f = open(conf_path, 'wb')
         try:
             f.write("""[DEFAULT]
 email=Joe Foo <[e-mail]>

=== modified file 'breezy/tests/blackbox/test_ls.py'
--- breezy/tests/blackbox/test_ls.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/blackbox/test_ls.py	2017-11-12 14:04:35 +0000
@@ -139,22 +139,22 @@
         """If a path is specified, files are listed with that prefix"""
         self.build_tree(['subdir/', 'subdir/b'])
         self.wt.add(['subdir', 'subdir/b'])
-        self.ls_equals('subdir/b\n' ,
+        self.ls_equals('subdir/b\n',
                        'subdir')
         self.ls_equals('../.bzrignore\n'
                        '../a\n'
                        '../subdir/\n'
-                       '../subdir/b\n' ,
+                       '../subdir/b\n',
                        '..', working_dir='subdir')
         self.ls_equals('../.bzrignore\0'
                        '../a\0'
                        '../subdir\0'
-                       '../subdir/b\0' ,
+                       '../subdir/b\0',
                        '.. --null', working_dir='subdir')
         self.ls_equals('?        ../.bzrignore\n'
                        '?        ../a\n'
                        'V        ../subdir/\n'
-                       'V        ../subdir/b\n' ,
+                       'V        ../subdir/b\n',
                        '.. --verbose', working_dir='subdir')
         self.run_bzr_error(['cannot specify both --from-root and PATH'],
                            'ls --from-root ..', working_dir='subdir')

=== modified file 'breezy/tests/blackbox/test_merge.py'
--- breezy/tests/blackbox/test_merge.py	2017-06-10 00:17:06 +0000
+++ breezy/tests/blackbox/test_merge.py	2017-11-12 14:04:35 +0000
@@ -121,7 +121,7 @@
                                 working_dir='a')
         self.assertTrue("Not a branch" in err)
         self.run_bzr('merge -r revno:%d:./..revno:%d:../b'
-                    %(ancestor,b.revno()), working_dir='a')
+                    %(ancestor, b.revno()), working_dir='a')
         self.assertEqual(a.get_parent_ids(),
                           [a.branch.last_revision(), b.last_revision()])
         self.check_file_contents('a/goodbye', 'quux')
@@ -264,7 +264,7 @@
         # test merge for failure without parent set
         out = self.run_bzr('merge', retcode=3, working_dir='branch_b')
         self.assertEqual(out,
-                ('','brz: ERROR: No location specified or remembered\n'))
+                ('', 'brz: ERROR: No location specified or remembered\n'))
 
         # test uncommitted changes
         self.build_tree(['branch_b/d'])

=== modified file 'breezy/tests/blackbox/test_missing.py'
--- breezy/tests/blackbox/test_missing.py	2017-06-10 00:17:06 +0000
+++ breezy/tests/blackbox/test_missing.py	2017-11-12 14:04:35 +0000
@@ -171,25 +171,25 @@
             b_tree.commit(message='b%d' % i)
 
         # local
-        out,err = self.run_bzr('missing ../b --my-revision 3',
+        out, err = self.run_bzr('missing ../b --my-revision 3',
                                retcode=1, working_dir='a')
         self.assertMessages(out, ('a3', 'b2', 'b3', 'b4', 'b5'), ('a2', 'a4'))
 
-        out,err = self.run_bzr('missing ../b --my-revision 3..4',
+        out, err = self.run_bzr('missing ../b --my-revision 3..4',
                                retcode=1, working_dir='a')
         self.assertMessages(out, ('a3', 'a4'), ('a2', 'a5'))
 
         #remote
-        out,err = self.run_bzr('missing ../b -r 3',
+        out, err = self.run_bzr('missing ../b -r 3',
                                retcode=1, working_dir='a')
         self.assertMessages(out, ('a2', 'a3', 'a4', 'a5', 'b3'), ('b2', 'b4'))
 
-        out,err = self.run_bzr('missing ../b -r 3..4',
+        out, err = self.run_bzr('missing ../b -r 3..4',
                                retcode=1, working_dir='a')
         self.assertMessages(out, ('b3', 'b4'), ('b2', 'b5'))
 
         #both
-        out,err = self.run_bzr('missing ../b --my-revision 3..4 -r 3..4',
+        out, err = self.run_bzr('missing ../b --my-revision 3..4 -r 3..4',
                                retcode=1, working_dir='a')
         self.assertMessages(out, ('a3', 'a4', 'b3', 'b4'),
             ('a2', 'a5', 'b2', 'b5'))

=== modified file 'breezy/tests/blackbox/test_mv.py'
--- breezy/tests/blackbox/test_mv.py	2017-10-27 09:03:47 +0000
+++ breezy/tests/blackbox/test_mv.py	2017-11-12 14:04:35 +0000
@@ -36,7 +36,7 @@
 
 class TestMove(TestCaseWithTransport):
 
-    def assertMoved(self,from_path,to_path):
+    def assertMoved(self, from_path, to_path):
         """Assert that to_path is existing and versioned but from_path not. """
         self.assertPathDoesNotExist(from_path)
         self.assertNotInWorkingTree(from_path)
@@ -51,20 +51,20 @@
         tree.add(['a', 'c', 'subdir'])
 
         self.run_bzr('mv a b')
-        self.assertMoved('a','b')
+        self.assertMoved('a', 'b')
 
         self.run_bzr('mv b subdir')
-        self.assertMoved('b','subdir/b')
+        self.assertMoved('b', 'subdir/b')
 
         self.run_bzr('mv subdir/b a')
-        self.assertMoved('subdir/b','a')
+        self.assertMoved('subdir/b', 'a')
 
         self.run_bzr('mv a c subdir')
-        self.assertMoved('a','subdir/a')
-        self.assertMoved('c','subdir/c')
+        self.assertMoved('a', 'subdir/a')
+        self.assertMoved('c', 'subdir/c')
 
         self.run_bzr('mv subdir/a subdir/newa')
-        self.assertMoved('subdir/a','subdir/newa')
+        self.assertMoved('subdir/a', 'subdir/newa')
 
     def test_mv_unversioned(self):
         self.build_tree(['unversioned.txt'])
@@ -102,18 +102,18 @@
         tree.add(['hello.txt', 'sub1'])
 
         self.run_bzr('mv sub1 sub2')
-        self.assertMoved('sub1','sub2')
+        self.assertMoved('sub1', 'sub2')
 
         self.run_bzr('mv hello.txt sub2')
-        self.assertMoved('hello.txt','sub2/hello.txt')
+        self.assertMoved('hello.txt', 'sub2/hello.txt')
 
         self.build_tree(['sub1/'])
         tree.add(['sub1'])
         self.run_bzr('mv sub2/hello.txt sub1')
-        self.assertMoved('sub2/hello.txt','sub1/hello.txt')
+        self.assertMoved('sub2/hello.txt', 'sub1/hello.txt')
 
         self.run_bzr('mv sub2 sub1')
-        self.assertMoved('sub2','sub1/sub2')
+        self.assertMoved('sub2', 'sub1/sub2')
 
     def test_mv_relative(self):
         self.build_tree(['sub1/', 'sub1/sub2/', 'sub1/hello.txt'])
@@ -124,7 +124,7 @@
         self.assertPathExists('sub1/sub2/hello.txt')
 
         self.run_bzr('mv sub2/hello.txt .', working_dir='sub1')
-        self.assertMoved('sub1/sub2/hello.txt','sub1/hello.txt')
+        self.assertMoved('sub1/sub2/hello.txt', 'sub1/hello.txt')
 
     def test_mv_change_case_file(self):
         # test for bug #77740 (mv unable change filename case on Windows)
@@ -215,7 +215,7 @@
 
         osutils.rename('a', 'b')
         self.run_bzr('mv a b')
-        self.assertMoved('a','b')
+        self.assertMoved('a', 'b')
 
     def test_mv_already_moved_file_to_versioned_target(self):
         """Test brz mv existing_file to versioned_file.
@@ -252,7 +252,7 @@
 
         osutils.rename('a', 'sub/a')
         self.run_bzr('mv a sub/a')
-        self.assertMoved('a','sub/a')
+        self.assertMoved('a', 'sub/a')
 
     def test_mv_already_moved_file_into_unversioned_subdir(self):
         """Test brz mv original_file to unversioned_directory/file.
@@ -287,8 +287,8 @@
 
         osutils.rename('a1', 'sub/a1')
         self.run_bzr('mv a1 a2 sub')
-        self.assertMoved('a1','sub/a1')
-        self.assertMoved('a2','sub/a2')
+        self.assertMoved('a1', 'sub/a1')
+        self.assertMoved('a2', 'sub/a2')
 
     def test_mv_already_moved_files_into_unversioned_subdir(self):
         """Test brz mv original_file to unversioned_directory.

=== modified file 'breezy/tests/blackbox/test_pull.py'
--- breezy/tests/blackbox/test_pull.py	2017-08-07 19:15:59 +0000
+++ breezy/tests/blackbox/test_pull.py	2017-11-12 14:04:35 +0000
@@ -244,7 +244,7 @@
         # test pull for failure without parent set
         out = self.run_bzr('pull', retcode=3, working_dir='branch_b')
         self.assertEqual(out,
-                ('','brz: ERROR: No pull location known or specified.\n'))
+                ('', 'brz: ERROR: No pull location known or specified.\n'))
         # test implicit --remember when no parent set, this pull conflicts
         self.build_tree(['branch_b/d'])
         tree_b.add('d')
@@ -252,7 +252,7 @@
         out = self.run_bzr('pull ../branch_a', retcode=3,
                            working_dir='branch_b')
         self.assertEqual(out,
-                ('','brz: ERROR: These branches have diverged.'
+                ('', 'brz: ERROR: These branches have diverged.'
                     ' Use the missing command to see how.\n'
                     'Use the merge command to reconcile them.\n'))
         tree_b = tree_b.controldir.open_workingtree()
@@ -483,14 +483,14 @@
         a_tree = self.example_branch('a')
         b_tree = a_tree.controldir.sprout('b').open_workingtree()
 
-        with open(osutils.pathjoin('a', 'hello'),'wt') as f:
+        with open(osutils.pathjoin('a', 'hello'), 'wt') as f:
             f.write('fee')
         a_tree.commit('fee')
 
-        with open(osutils.pathjoin('b', 'hello'),'wt') as f:
+        with open(osutils.pathjoin('b', 'hello'), 'wt') as f:
             f.write('fie')
 
-        out,err=self.run_bzr(['pull','-d','b','a','--show-base'])
+        out, err=self.run_bzr(['pull', '-d', 'b', 'a', '--show-base'])
 
         # check for message here
         self.assertEqual(
@@ -509,7 +509,7 @@
         see https://bugs.launchpad.net/bzr/+bug/1022160"""
         self.make_branch('from')
         self.make_branch('to')
-        out = self.run_bzr(['pull','-d','to','from','--show-base'])
+        out = self.run_bzr(['pull', '-d', 'to', 'from', '--show-base'])
         self.assertEqual(out, ('No revisions or tags to pull.\n',
                                'No working tree, ignoring --show-base\n'))
 
@@ -520,7 +520,7 @@
         from_tree.branch.tags.set_tag("mytag", "somerevid")
         to_tree = self.make_branch_and_tree('to')
         to_tree.branch.tags.set_tag("mytag", "anotherrevid")
-        out = self.run_bzr(['pull','-d','to','from'],retcode=1)
+        out = self.run_bzr(['pull', '-d', 'to', 'from'], retcode=1)
         self.assertEqual(out,
             ('No revisions to pull.\nConflicting tags:\n    mytag\n', ''))
 

=== modified file 'breezy/tests/blackbox/test_push.py'
--- breezy/tests/blackbox/test_push.py	2017-10-27 00:18:42 +0000
+++ breezy/tests/blackbox/test_push.py	2017-11-12 14:04:35 +0000
@@ -68,13 +68,13 @@
         # If there is no parent location set, :parent isn't mentioned.
         out = self.run_bzr('push', working_dir='a', retcode=3)
         self.assertEqual(out,
-                ('','brz: ERROR: No push location known or specified.\n'))
+                ('', 'brz: ERROR: No push location known or specified.\n'))
 
         # If there is a parent location set, the error suggests :parent.
         tree_a.branch.set_parent(tree_b.branch.base)
         out = self.run_bzr('push', working_dir='a', retcode=3)
         self.assertEqual(out,
-            ('','brz: ERROR: No push location known or specified. '
+            ('', 'brz: ERROR: No push location known or specified. '
                 'To push to the parent branch '
                 '(at %s), use \'brz push :parent\'.\n' %
                 urlutils.unescape_for_display(tree_b.branch.base, 'utf-8')))
@@ -103,7 +103,7 @@
         # test push for failure without push location set
         out = self.run_bzr('push', working_dir='branch_a', retcode=3)
         self.assertEqual(out,
-                ('','brz: ERROR: No push location known or specified.\n'))
+                ('', 'brz: ERROR: No push location known or specified.\n'))
 
         # test not remembered if cannot actually push
         self.run_bzr('push path/which/doesnt/exist',
@@ -117,7 +117,7 @@
         out = self.run_bzr('push ../branch_b',
                            working_dir='branch_a', retcode=3)
         self.assertEqual(out,
-                ('','brz: ERROR: These branches have diverged.  '
+                ('', 'brz: ERROR: These branches have diverged.  '
                  'See "brz help diverged-branches" for more information.\n'))
         # Refresh the branch as 'push' modified it
         branch_a = branch_a.controldir.open_branch()

=== modified file 'breezy/tests/blackbox/test_remove.py'
--- breezy/tests/blackbox/test_remove.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/blackbox/test_remove.py	2017-11-12 14:04:35 +0000
@@ -266,7 +266,7 @@
         tree = WorkingTree.open('.')
         self.assertInWorkingTree(a)
         self.assertEqual(tree.path2id(a), a + _id)
-        self.assertFilesUnversioned([b,c])
+        self.assertFilesUnversioned([b, c])
 
     def test_remove_with_new_in_dir2(self):
         tree = self._make_tree_and_add(files)

=== modified file 'breezy/tests/blackbox/test_revision_history.py'
--- breezy/tests/blackbox/test_revision_history.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/blackbox/test_revision_history.py	2017-11-12 14:04:35 +0000
@@ -28,13 +28,13 @@
         with open('test/foo', 'wb') as f:
             f.write('1111\n')
         tree.add('foo')
-        tree.commit('added foo',rev_id='revision_1')
+        tree.commit('added foo', rev_id='revision_1')
         with open('test/foo', 'wb')as f:
             f.write('2222\n')
-        tree.commit('updated foo',rev_id='revision_2')
+        tree.commit('updated foo', rev_id='revision_2')
         with open('test/foo', 'wb')as f:
             f.write('3333\n')
-        tree.commit('updated foo again',rev_id='revision_3')
+        tree.commit('updated foo again', rev_id='revision_3')
         return tree
 
     def _check_revision_history(self, location='', working_dir=None):

=== modified file 'breezy/tests/blackbox/test_revision_info.py'
--- breezy/tests/blackbox/test_revision_info.py	2017-06-10 00:17:06 +0000
+++ breezy/tests/blackbox/test_revision_info.py	2017-11-12 14:04:35 +0000
@@ -110,7 +110,7 @@
         b = self.make_branch('branch')
 
         # Try getting the --tree revision-info
-        out,err = self.run_bzr('revision-info --tree -d branch', retcode=3)
+        out, err = self.run_bzr('revision-info --tree -d branch', retcode=3)
         self.assertEqual('', out)
         self.assertEqual('brz: ERROR: No WorkingTree exists for "branch".\n',
             err)

=== modified file 'breezy/tests/blackbox/test_revno.py'
--- breezy/tests/blackbox/test_revno.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/blackbox/test_revno.py	2017-11-12 14:04:35 +0000
@@ -61,12 +61,12 @@
         wt.commit('mkfile')
 
         # Make sure revno says we're on 1
-        out,err = self.run_bzr('revno checkout')
+        out, err = self.run_bzr('revno checkout')
         self.assertEqual('', err)
         self.assertEqual('1\n', out)
 
         # Make sure --tree knows it's still on 0
-        out,err = self.run_bzr('revno --tree checkout')
+        out, err = self.run_bzr('revno --tree checkout')
         self.assertEqual('', err)
         self.assertEqual('0\n', out)
 
@@ -75,7 +75,7 @@
         b = self.make_branch('branch')
 
         # Try getting it's --tree revno
-        out,err = self.run_bzr('revno --tree branch', retcode=3)
+        out, err = self.run_bzr('revno --tree branch', retcode=3)
         self.assertEqual('', out)
         self.assertEqual('brz: ERROR: No WorkingTree exists for "branch".\n',
             err)

=== modified file 'breezy/tests/blackbox/test_selftest.py'
--- breezy/tests/blackbox/test_selftest.py	2017-08-27 01:58:16 +0000
+++ breezy/tests/blackbox/test_selftest.py	2017-11-12 14:04:35 +0000
@@ -125,7 +125,7 @@
         # If the last body line is blank, drop it off the list
         if len(body) > 0 and body[-1] == '':
             body.pop()
-        return (header,body,footer)
+        return (header, body, footer)
 
     def test_list_only(self):
         # check that brz selftest --list-only outputs no ui noise
@@ -133,8 +133,8 @@
             """Capture the arguments selftest was run with."""
             return True
         def outputs_nothing(cmdline):
-            out,err = self.run_bzr(cmdline)
-            (header,body,footer) = self._parse_test_list(out.splitlines())
+            out, err = self.run_bzr(cmdline)
+            (header, body, footer) = self._parse_test_list(out.splitlines())
             num_tests = len(body)
             self.assertLength(0, header)
             self.assertLength(0, footer)

=== modified file 'breezy/tests/blackbox/test_split.py'
--- breezy/tests/blackbox/test_split.py	2017-06-10 16:40:42 +0000
+++ breezy/tests/blackbox/test_split.py	2017-11-12 14:04:35 +0000
@@ -45,7 +45,7 @@
         self.build_tree(['tree/subtree/'])
         tree.add('subtree')
         tree.commit('added subtree')
-        self.run_bzr_error(('must upgrade your branch at .*tree','rich roots'),
+        self.run_bzr_error(('must upgrade your branch at .*tree', 'rich roots'),
                            'split tree/subtree')
 
     def split_formats(self, format, repo_format):

=== modified file 'breezy/tests/blackbox/test_status.py'
--- breezy/tests/blackbox/test_status.py	2017-06-10 16:40:42 +0000
+++ breezy/tests/blackbox/test_status.py	2017-11-12 14:04:35 +0000
@@ -212,8 +212,8 @@
         wt = self.make_branch_and_tree('.')
         b = wt.branch
 
-        self.build_tree(['directory/','directory/hello.c',
-                         'bye.c','test.c','dir2/',
+        self.build_tree(['directory/', 'directory/hello.c',
+                         'bye.c', 'test.c', 'dir2/',
                          'missing.c'])
         wt.add('directory')
         wt.add('test.c')
@@ -242,7 +242,7 @@
         tof = BytesIO()
         self.assertRaises(errors.PathsDoNotExist,
                           show_tree_status,
-                          wt, specific_files=['bye.c','test.c','absent.c'],
+                          wt, specific_files=['bye.c', 'test.c', 'absent.c'],
                           to_file=tof)
 
         tof = BytesIO()

=== modified file 'breezy/tests/blackbox/test_too_much.py'
--- breezy/tests/blackbox/test_too_much.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/blackbox/test_too_much.py	2017-11-12 14:04:35 +0000
@@ -522,14 +522,14 @@
             self.assertEqual(listdir_sorted("."), [ "d2", "link2" ])
             self.assertEqual(listdir_sorted("d2"), [ "link1", "link3" ])
             self.assertEqual(os.readlink("d2/link1"), "NOWHERE1")
-            self.assertEqual(os.readlink("link2")   , "NOWHERE2")
+            self.assertEqual(os.readlink("link2"), "NOWHERE2")
             chdir("..")
 
             self.run_bzr('export -r 4 exp4.tmp')
             chdir("exp4.tmp")
             self.assertEqual(listdir_sorted("."), [ "d2", "link2" ])
             self.assertEqual(os.readlink("d2/link1"), "TARGET 1")
-            self.assertEqual(os.readlink("link2")   , "TARGET 2")
+            self.assertEqual(os.readlink("link2"), "TARGET 2")
             self.assertEqual(listdir_sorted("d2"), [ "link1", "link3" ])
             chdir("..")
 

=== modified file 'breezy/tests/blackbox/test_update.py'
--- breezy/tests/blackbox/test_update.py	2017-06-10 16:40:42 +0000
+++ breezy/tests/blackbox/test_update.py	2017-11-12 14:04:35 +0000
@@ -83,7 +83,7 @@
         self.run_bzr('add checkout/file')
         self.run_bzr('commit -m add-file checkout')
         # now branch should be out of date
-        out,err = self.run_bzr('update branch')
+        out, err = self.run_bzr('update branch')
         self.assertEqual('', out)
         self.assertEqualDiff("""+N  file
 All changes applied successfully.
@@ -101,7 +101,7 @@
         self.run_bzr('add checkout/file')
         self.run_bzr('commit -m add-file checkout')
         # now checkout2 should be out of date
-        out,err = self.run_bzr('update checkout2')
+        out, err = self.run_bzr('update checkout2')
         self.assertEqualDiff('''+N  file
 All changes applied successfully.
 Updated to revision 1 of branch %s
@@ -127,7 +127,7 @@
         a_file = file('checkout2/file', 'wt')
         a_file.write('Bar')
         a_file.close()
-        out,err = self.run_bzr('update checkout2', retcode=1)
+        out, err = self.run_bzr('update checkout2', retcode=1)
         self.assertEqualDiff(''' M  file
 Text conflict in file
 1 conflicts encountered.
@@ -365,26 +365,26 @@
 
         tree=self.make_branch_and_tree('.')
 
-        f = open('hello','wt')
+        f = open('hello', 'wt')
         f.write('foo')
         f.close()
         tree.add('hello')
         tree.commit('fie')
 
-        f = open('hello','wt')
+        f = open('hello', 'wt')
         f.write('fee')
         f.close()
         tree.commit('fee')
 
         #tree.update() gives no such revision, so ...
-        self.run_bzr(['update','-r1'])
+        self.run_bzr(['update', '-r1'])
 
         #create conflict
-        f = open('hello','wt')
+        f = open('hello', 'wt')
         f.write('fie')
         f.close()
 
-        out, err = self.run_bzr(['update','--show-base'],retcode=1)
+        out, err = self.run_bzr(['update', '--show-base'], retcode=1)
 
         # check for conflict notification
         self.assertContainsString(err,

=== modified file 'breezy/tests/blackbox/test_versioning.py'
--- breezy/tests/blackbox/test_versioning.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/blackbox/test_versioning.py	2017-11-12 14:04:35 +0000
@@ -79,7 +79,7 @@
 
         self.assertEqual(len(delta.added), 2)
         self.assertEqual(delta.added[0][0], 'dir')
-        self.assertEqual(delta.added[1][0], pathjoin('dir','subdir'))
+        self.assertEqual(delta.added[1][0], pathjoin('dir', 'subdir'))
         self.assertFalse(delta.modified)
 
     def test_mkdir_w_nested_trees(self):

=== modified file 'breezy/tests/http_server.py'
--- breezy/tests/http_server.py	2017-09-26 00:55:04 +0000
+++ breezy/tests/http_server.py	2017-11-12 14:04:35 +0000
@@ -229,7 +229,7 @@
     def get_multiple_ranges(self, file, file_size, ranges):
         self.send_response(206)
         self.send_header('Accept-Ranges', 'bytes')
-        boundary = '%d' % random.randint(0,0x7FFFFFFF)
+        boundary = '%d' % random.randint(0, 0x7FFFFFFF)
         self.send_header('Content-Type',
                          'multipart/byteranges; boundary=%s' % boundary)
         boundary_line = '--%s\r\n' % boundary

=== modified file 'breezy/tests/http_utils.py'
--- breezy/tests/http_utils.py	2017-09-26 00:55:04 +0000
+++ breezy/tests/http_utils.py	2017-11-12 14:04:35 +0000
@@ -216,7 +216,7 @@
     def redirect_to(self, host, port):
         """Redirect all requests to a specific host:port"""
         self.redirections = [('(.*)',
-                              r'http://%s:%s\1' % (host, port) ,
+                              r'http://%s:%s\1' % (host, port),
                               301)]
 
     def is_redirected(self, path):
@@ -374,7 +374,7 @@
         header = 'Digest realm="%s", ' % tcs.auth_realm
         header += 'nonce="%s", algorithm="%s", qop="auth"' % (tcs.auth_nonce,
                                                               'MD5')
-        self.send_header(tcs.auth_header_sent,header)
+        self.send_header(tcs.auth_header_sent, header)
 
 
 class DigestAndBasicAuthRequestHandler(DigestAuthRequestHandler):
@@ -392,7 +392,7 @@
         header = 'Digest realm="%s", ' % tcs.auth_realm
         header += 'nonce="%s", algorithm="%s", qop="auth"' % (tcs.auth_nonce,
                                                               'MD5')
-        self.send_header(tcs.auth_header_sent,header)
+        self.send_header(tcs.auth_header_sent, header)
 
 
 class AuthServer(http_server.HttpServer):

=== modified file 'breezy/tests/per_branch/__init__.py'
--- breezy/tests/per_branch/__init__.py	2017-08-10 02:02:57 +0000
+++ breezy/tests/per_branch/__init__.py	2017-11-12 14:04:35 +0000
@@ -49,10 +49,10 @@
             branch_format.__class__.__name__)
         scenario_name += name_suffix
         scenario = (scenario_name, {
-            "transport_server":transport_server,
-            "transport_readonly_server":transport_readonly_server,
-            "bzrdir_format":bzrdir_format,
-            "branch_format":branch_format,
+            "transport_server": transport_server,
+            "transport_readonly_server": transport_readonly_server,
+            "bzrdir_format": bzrdir_format,
+            "branch_format": branch_format,
                 })
         result.append(scenario)
     return result

=== modified file 'breezy/tests/per_intertree/__init__.py'
--- breezy/tests/per_intertree/__init__.py	2017-08-05 01:03:53 +0000
+++ breezy/tests/per_intertree/__init__.py	2017-11-12 14:04:35 +0000
@@ -95,13 +95,13 @@
         scenario = (label, {
             "transport_server": transport_server,
             "transport_readonly_server": transport_readonly_server,
-            "bzrdir_format":workingtree_format._matchingcontroldir,
-            "workingtree_format":workingtree_format,
-            "intertree_class":intertree_class,
-            "workingtree_format_to":workingtree_format_to,
+            "bzrdir_format": workingtree_format._matchingcontroldir,
+            "workingtree_format": workingtree_format,
+            "intertree_class": intertree_class,
+            "workingtree_format_to": workingtree_format_to,
             # mutable_trees_to_test_trees takes two trees and converts them to,
             # whatever relationship the optimiser under test requires.,
-            "mutable_trees_to_test_trees":mutable_trees_to_test_trees,
+            "mutable_trees_to_test_trees": mutable_trees_to_test_trees,
             # workingtree_to_test_tree is set to disable changing individual,
             # trees: instead the mutable_trees_to_test_trees helper is used.,
             "_workingtree_to_test_tree": return_parameter,

=== modified file 'breezy/tests/per_inventory/basics.py'
--- breezy/tests/per_inventory/basics.py	2017-06-08 23:30:31 +0000
+++ breezy/tests/per_inventory/basics.py	2017-11-12 14:04:35 +0000
@@ -154,8 +154,8 @@
     def test_non_directory_children(self):
         """Test path2id when a parent directory has no children"""
         inv = inventory.Inventory('tree-root')
-        inv.add(self.make_file('file-id','file', 'tree-root'))
-        inv.add(self.make_link('link-id','link', 'tree-root'))
+        inv.add(self.make_file('file-id', 'file', 'tree-root'))
+        inv.add(self.make_link('link-id', 'link', 'tree-root'))
         self.assertIs(None, inv.path2id('file/subfile'))
         self.assertIs(None, inv.path2id('link/subfile'))
 

=== modified file 'breezy/tests/per_repository/__init__.py'
--- breezy/tests/per_repository/__init__.py	2017-08-05 01:03:53 +0000
+++ breezy/tests/per_repository/__init__.py	2017-11-12 14:04:35 +0000
@@ -52,10 +52,10 @@
         scenario_name = repository_format.__class__.__name__
         scenario_name += scenario_name_suffix
         scenario = (scenario_name,
-            {"transport_server":transport_server,
-             "transport_readonly_server":transport_readonly_server,
-             "bzrdir_format":repository_format._matchingcontroldir,
-             "repository_format":repository_format,
+            {"transport_server": transport_server,
+             "transport_readonly_server": transport_readonly_server,
+             "bzrdir_format": repository_format._matchingcontroldir,
+             "repository_format": repository_format,
              })
         # Only override the test's vfs_transport_factory if one was
         # specified, otherwise just leave the default in place.

=== modified file 'breezy/tests/per_repository/test_get_parent_map.py'
--- breezy/tests/per_repository/test_get_parent_map.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/per_repository/test_get_parent_map.py	2017-11-12 14:04:35 +0000
@@ -41,9 +41,9 @@
         self.addCleanup(repo.unlock)
         self.assertEqual({rev3:(rev1, rev2)},
                          repo.get_parent_map([rev3]))
-        self.assertEqual({rev1:(revision.NULL_REVISION,),
-                          rev2:(rev1,),
-                          rev3:(rev1, rev2),
+        self.assertEqual({rev1: (revision.NULL_REVISION,),
+                          rev2: (rev1,),
+                          rev3: (rev1, rev2),
                          }, repo.get_parent_map([rev1, rev2, rev3]))
 
     def test_no_parents(self):

=== modified file 'breezy/tests/per_repository_vf/test_fileid_involved.py'
--- breezy/tests/per_repository_vf/test_fileid_involved.py	2017-06-11 14:07:05 +0000
+++ breezy/tests/per_repository_vf/test_fileid_involved.py	2017-11-12 14:04:35 +0000
@@ -165,7 +165,7 @@
 
         main_wt = self.make_branch_and_tree('main')
         main_branch = main_wt.branch
-        self.build_tree(["main/a","main/b","main/c"])
+        self.build_tree(["main/a", "main/b", "main/c"])
 
         main_wt.add(['a', 'b', 'c'], ['a-file-id-2006-01-01-abcd',
                                  'b-file-id-2006-01-01-defg',
@@ -211,7 +211,7 @@
 
         #-------- end C -----------
 
-        bt1.rename_one("d","e")
+        bt1.rename_one("d", "e")
         bt1.commit("branch1, commit two", rev_id="rev-F")
 
         #-------- end F -----------
@@ -237,12 +237,12 @@
     def test_fileids_altered_between_two_revs(self):
         self.branch.lock_read()
         self.addCleanup(self.branch.unlock)
-        self.branch.repository.fileids_altered_by_revision_ids(["rev-J","rev-K"])
+        self.branch.repository.fileids_altered_by_revision_ids(["rev-J", "rev-K"])
         self.assertEqual(
             {'b-file-id-2006-01-01-defg':{'rev-J'},
              'c-funky<file-id>quiji%bo':{'rev-K'}
              },
-            self.branch.repository.fileids_altered_by_revision_ids(["rev-J","rev-K"]))
+            self.branch.repository.fileids_altered_by_revision_ids(["rev-J", "rev-K"]))
 
         self.assertEqual(
             {'b-file-id-2006-01-01-defg': {'rev-<D>'},
@@ -281,7 +281,7 @@
         self.branch.lock_read()
         self.addCleanup(self.branch.unlock)
         self.assertEqual(
-            {'a-file-id-2006-01-01-abcd':{'rev-A'},
+            {'a-file-id-2006-01-01-abcd': {'rev-A'},
              'b-file-id-2006-01-01-defg': {'rev-A'},
              'c-funky<file-id>quiji%bo': {'rev-A'},
              },
@@ -312,9 +312,9 @@
         if len(history) < 2:
             return
 
-        for start in range(0,len(history)-1):
+        for start in range(0, len(history)-1):
             start_id = history[start]
-            for end in range(start+1,len(history)):
+            for end in range(start+1, len(history)):
                 end_id = history[end]
                 unique_revs = graph.find_unique_ancestors(end_id, [start_id])
                 l1 = self.branch.repository.fileids_altered_by_revision_ids(
@@ -365,7 +365,7 @@
         self.branch = None
         main_wt = self.make_branch_and_tree('main')
         main_branch = main_wt.branch
-        self.build_tree(["main/a","main/b","main/c"])
+        self.build_tree(["main/a", "main/b", "main/c"])
 
         main_wt.add(['a', 'b', 'c'], ['a-file-id-2006-01-01-abcd',
                                  'b-file-id-2006-01-01-defg',

=== modified file 'breezy/tests/per_transport.py'
--- breezy/tests/per_transport.py	2017-07-15 13:23:08 +0000
+++ breezy/tests/per_transport.py	2017-11-12 14:04:35 +0000
@@ -1693,7 +1693,7 @@
         self.assertTrue(data_len >= 100)
         check_result_data(result)
         # close ranges get combined (even if out of order)
-        for request_vector in [((400,50), (800, 234)), ((800, 234), (400,50))]:
+        for request_vector in [((400, 50), (800, 234)), ((800, 234), (400, 50))]:
             result = list(transport.readv('a', request_vector,
                 adjust_for_latency=True, upper_limit=content_size))
             self.assertEqual(1, len(result))
@@ -1731,7 +1731,7 @@
         handle = t.open_write_stream('foo')
         try:
             handle.write('bcd')
-            self.assertEqual([(0, 'b'), (2, 'd')], list(t.readv('foo', ((0,1), (2,1)))))
+            self.assertEqual([(0, 'b'), (2, 'd')], list(t.readv('foo', ((0, 1), (2, 1)))))
         finally:
             handle.close()
 
@@ -1758,12 +1758,12 @@
         self.assertListRaises((errors.ShortReadvError, errors.InvalidRange,
                                # Can be raised by paramiko
                                AssertionError),
-                              transport.readv, 'a', [(1,1), (8,10)])
+                              transport.readv, 'a', [(1, 1), (8, 10)])
 
         # This is trying to seek past the end of the file, it should
         # also raise a special error
         self.assertListRaises((errors.ShortReadvError, errors.InvalidRange),
-                              transport.readv, 'a', [(12,2)])
+                              transport.readv, 'a', [(12, 2)])
 
     def test_no_segment_parameters(self):
         """Segment parameters should be stripped and stored in

=== modified file 'breezy/tests/per_versionedfile.py'
--- breezy/tests/per_versionedfile.py	2017-07-12 00:35:04 +0000
+++ breezy/tests/per_versionedfile.py	2017-11-12 14:04:35 +0000
@@ -482,32 +482,32 @@
         next_parent = 'base'
         text_name = 'chain1-'
         text = ['line\n']
-        sha1s = {0 :'da6d3141cb4a5e6f464bf6e0518042ddc7bfd079',
-                 1 :'45e21ea146a81ea44a821737acdb4f9791c8abe7',
-                 2 :'e1f11570edf3e2a070052366c582837a4fe4e9fa',
-                 3 :'26b4b8626da827088c514b8f9bbe4ebf181edda1',
-                 4 :'e28a5510be25ba84d31121cff00956f9970ae6f6',
-                 5 :'d63ec0ce22e11dcf65a931b69255d3ac747a318d',
-                 6 :'2c2888d288cb5e1d98009d822fedfe6019c6a4ea',
-                 7 :'95c14da9cafbf828e3e74a6f016d87926ba234ab',
-                 8 :'779e9a0b28f9f832528d4b21e17e168c67697272',
-                 9 :'1f8ff4e5c6ff78ac106fcfe6b1e8cb8740ff9a8f',
-                 10:'131a2ae712cf51ed62f143e3fbac3d4206c25a05',
-                 11:'c5a9d6f520d2515e1ec401a8f8a67e6c3c89f199',
-                 12:'31a2286267f24d8bedaa43355f8ad7129509ea85',
-                 13:'dc2a7fe80e8ec5cae920973973a8ee28b2da5e0a',
-                 14:'2c4b1736566b8ca6051e668de68650686a3922f2',
-                 15:'5912e4ecd9b0c07be4d013e7e2bdcf9323276cde',
-                 16:'b0d2e18d3559a00580f6b49804c23fea500feab3',
-                 17:'8e1d43ad72f7562d7cb8f57ee584e20eb1a69fc7',
-                 18:'5cf64a3459ae28efa60239e44b20312d25b253f3',
-                 19:'1ebed371807ba5935958ad0884595126e8c4e823',
-                 20:'2aa62a8b06fb3b3b892a3292a068ade69d5ee0d3',
-                 21:'01edc447978004f6e4e962b417a4ae1955b6fe5d',
-                 22:'d8d8dc49c4bf0bab401e0298bb5ad827768618bb',
-                 23:'c21f62b1c482862983a8ffb2b0c64b3451876e3f',
-                 24:'c0593fe795e00dff6b3c0fe857a074364d5f04fc',
-                 25:'dd1a1cf2ba9cc225c3aff729953e6364bf1d1855',
+        sha1s = {0: 'da6d3141cb4a5e6f464bf6e0518042ddc7bfd079',
+                 1: '45e21ea146a81ea44a821737acdb4f9791c8abe7',
+                 2: 'e1f11570edf3e2a070052366c582837a4fe4e9fa',
+                 3: '26b4b8626da827088c514b8f9bbe4ebf181edda1',
+                 4: 'e28a5510be25ba84d31121cff00956f9970ae6f6',
+                 5: 'd63ec0ce22e11dcf65a931b69255d3ac747a318d',
+                 6: '2c2888d288cb5e1d98009d822fedfe6019c6a4ea',
+                 7: '95c14da9cafbf828e3e74a6f016d87926ba234ab',
+                 8: '779e9a0b28f9f832528d4b21e17e168c67697272',
+                 9: '1f8ff4e5c6ff78ac106fcfe6b1e8cb8740ff9a8f',
+                 10: '131a2ae712cf51ed62f143e3fbac3d4206c25a05',
+                 11: 'c5a9d6f520d2515e1ec401a8f8a67e6c3c89f199',
+                 12: '31a2286267f24d8bedaa43355f8ad7129509ea85',
+                 13: 'dc2a7fe80e8ec5cae920973973a8ee28b2da5e0a',
+                 14: '2c4b1736566b8ca6051e668de68650686a3922f2',
+                 15: '5912e4ecd9b0c07be4d013e7e2bdcf9323276cde',
+                 16: 'b0d2e18d3559a00580f6b49804c23fea500feab3',
+                 17: '8e1d43ad72f7562d7cb8f57ee584e20eb1a69fc7',
+                 18: '5cf64a3459ae28efa60239e44b20312d25b253f3',
+                 19: '1ebed371807ba5935958ad0884595126e8c4e823',
+                 20: '2aa62a8b06fb3b3b892a3292a068ade69d5ee0d3',
+                 21: '01edc447978004f6e4e962b417a4ae1955b6fe5d',
+                 22: 'd8d8dc49c4bf0bab401e0298bb5ad827768618bb',
+                 23: 'c21f62b1c482862983a8ffb2b0c64b3451876e3f',
+                 24: 'c0593fe795e00dff6b3c0fe857a074364d5f04fc',
+                 25: 'dd1a1cf2ba9cc225c3aff729953e6364bf1d1855',
                  }
         for depth in range(26):
             new_version = text_name + '%s' % depth
@@ -880,14 +880,14 @@
             self.plan_merge_vf.get_parent_map([('root', 'B')]))
         self.assertEqual({('root', 'D'):(('root', 'C'),)},
             self.plan_merge_vf.get_parent_map([('root', 'D')]))
-        self.assertEqual({('root', 'E:'):(('root', 'B'),('root', 'D'))},
+        self.assertEqual({('root', 'E:'):(('root', 'B'), ('root', 'D'))},
             self.plan_merge_vf.get_parent_map([('root', 'E:')]))
         self.assertEqual({},
             self.plan_merge_vf.get_parent_map([('root', 'F')]))
         self.assertEqual({
-                ('root', 'B'):(('root', 'A'),),
-                ('root', 'D'):(('root', 'C'),),
-                ('root', 'E:'):(('root', 'B'),('root', 'D')),
+                ('root', 'B'): (('root', 'A'),),
+                ('root', 'D'): (('root', 'C'),),
+                ('root', 'E:'): (('root', 'B'), ('root', 'D')),
                 },
             self.plan_merge_vf.get_parent_map(
                 [('root', 'B'), ('root', 'D'), ('root', 'E:'), ('root', 'F')]))
@@ -1396,78 +1396,78 @@
     # plain text knits in packs (texts)
     len_one_scenarios = [
         ('weave-named', {
-            'cleanup':None,
-            'factory':make_versioned_files_factory(WeaveFile,
+            'cleanup': None,
+            'factory': make_versioned_files_factory(WeaveFile,
                 ConstantMapper('inventory')),
-            'graph':True,
-            'key_length':1,
+            'graph': True,
+            'key_length': 1,
             'support_partial_insertion': False,
             }),
         ('named-knit', {
-            'cleanup':None,
-            'factory':make_file_factory(False, ConstantMapper('revisions')),
-            'graph':True,
-            'key_length':1,
+            'cleanup': None,
+            'factory': make_file_factory(False, ConstantMapper('revisions')),
+            'graph': True,
+            'key_length': 1,
             'support_partial_insertion': False,
             }),
         ('named-nograph-nodelta-knit-pack', {
-            'cleanup':cleanup_pack_knit,
-            'factory':make_pack_factory(False, False, 1),
-            'graph':False,
-            'key_length':1,
+            'cleanup': cleanup_pack_knit,
+            'factory': make_pack_factory(False, False, 1),
+            'graph': False,
+            'key_length': 1,
             'support_partial_insertion': False,
             }),
         ('named-graph-knit-pack', {
-            'cleanup':cleanup_pack_knit,
-            'factory':make_pack_factory(True, True, 1),
-            'graph':True,
-            'key_length':1,
+            'cleanup': cleanup_pack_knit,
+            'factory': make_pack_factory(True, True, 1),
+            'graph': True,
+            'key_length': 1,
             'support_partial_insertion': True,
             }),
         ('named-graph-nodelta-knit-pack', {
-            'cleanup':cleanup_pack_knit,
-            'factory':make_pack_factory(True, False, 1),
-            'graph':True,
-            'key_length':1,
+            'cleanup': cleanup_pack_knit,
+            'factory': make_pack_factory(True, False, 1),
+            'graph': True,
+            'key_length': 1,
             'support_partial_insertion': False,
             }),
         ('groupcompress-nograph', {
-            'cleanup':groupcompress.cleanup_pack_group,
-            'factory':groupcompress.make_pack_factory(False, False, 1),
+            'cleanup': groupcompress.cleanup_pack_group,
+            'factory': groupcompress.make_pack_factory(False, False, 1),
             'graph': False,
-            'key_length':1,
-            'support_partial_insertion':False,
+            'key_length': 1,
+            'support_partial_insertion': False,
             }),
         ]
     len_two_scenarios = [
         ('weave-prefix', {
-            'cleanup':None,
-            'factory':make_versioned_files_factory(WeaveFile,
+            'cleanup': None,
+            'factory': make_versioned_files_factory(WeaveFile,
                 PrefixMapper()),
-            'graph':True,
-            'key_length':2,
+            'graph': True,
+            'key_length': 2,
             'support_partial_insertion': False,
             }),
         ('annotated-knit-escape', {
-            'cleanup':None,
-            'factory':make_file_factory(True, HashEscapedPrefixMapper()),
-            'graph':True,
-            'key_length':2,
+            'cleanup': None,
+            'factory': make_file_factory(True, HashEscapedPrefixMapper()),
+            'graph': True,
+            'key_length': 2,
             'support_partial_insertion': False,
             }),
         ('plain-knit-pack', {
-            'cleanup':cleanup_pack_knit,
-            'factory':make_pack_factory(True, True, 2),
-            'graph':True,
-            'key_length':2,
+            'cleanup': cleanup_pack_knit,
+            'factory': make_pack_factory(True, True, 2),
+            'graph': True,
+            'key_length': 2,
             'support_partial_insertion': True,
             }),
         ('groupcompress', {
-            'cleanup':groupcompress.cleanup_pack_group,
-            'factory':groupcompress.make_pack_factory(True, False, 1),
+            'cleanup': groupcompress.cleanup_pack_group,
+            'factory': groupcompress.make_pack_factory(True, False, 1),
             'graph': True,
-            'key_length':1,
-            'support_partial_insertion':False,
+            'key_length': 1,
+            'support_partial_insertion': False,
             }),
         ]
 
@@ -1860,10 +1860,10 @@
                 ('FileB', 'base'),
                 ]
             sort_order = {
-                ('FileA', 'merged'):2, ('FileA', 'left'):1, ('FileA', 'right'):1,
-                ('FileA', 'base'):0,
-                ('FileB', 'merged'):2, ('FileB', 'left'):1, ('FileB', 'right'):1,
-                ('FileB', 'base'):0,
+                ('FileA', 'merged'): 2, ('FileA', 'left'): 1, ('FileA', 'right'): 1,
+                ('FileA', 'base'): 0,
+                ('FileB', 'merged'): 2, ('FileB', 'left'): 1, ('FileB', 'right'): 1,
+                ('FileB', 'base'): 0,
                 }
         return keys, sort_order
 
@@ -1880,10 +1880,10 @@
                 ('FileB', 'base'),
                 ]
             sort_order = {
-                ('FileA', 'merged'):0, ('FileA', 'left'):1, ('FileA', 'right'):1,
-                ('FileA', 'base'):2,
-                ('FileB', 'merged'):3, ('FileB', 'left'):4, ('FileB', 'right'):4,
-                ('FileB', 'base'):5,
+                ('FileA', 'merged'): 0, ('FileA', 'left'): 1, ('FileA', 'right'): 1,
+                ('FileA', 'base'): 2,
+                ('FileB', 'merged'): 3, ('FileB', 'left'): 4, ('FileB', 'right'): 4,
+                ('FileB', 'base'): 5,
                 }
         return keys, sort_order
 
@@ -2259,7 +2259,7 @@
                 (('r1',), self.get_parents((('r0',),))),
                 (('r2',), self.get_parents(())),
                 (('r3',), self.get_parents(())),
-                (('m',), self.get_parents((('r0',),('r1',),('r2',),('r3',)))),
+                (('m',), self.get_parents((('r0',), ('r1',), ('r2',), ('r3',)))),
                 ]
         else:
             parent_details = [
@@ -2676,32 +2676,32 @@
         next_parent = self.get_simple_key('base')
         text_name = 'chain1-'
         text = ['line\n']
-        sha1s = {0 :'da6d3141cb4a5e6f464bf6e0518042ddc7bfd079',
-                 1 :'45e21ea146a81ea44a821737acdb4f9791c8abe7',
-                 2 :'e1f11570edf3e2a070052366c582837a4fe4e9fa',
-                 3 :'26b4b8626da827088c514b8f9bbe4ebf181edda1',
-                 4 :'e28a5510be25ba84d31121cff00956f9970ae6f6',
-                 5 :'d63ec0ce22e11dcf65a931b69255d3ac747a318d',
-                 6 :'2c2888d288cb5e1d98009d822fedfe6019c6a4ea',
-                 7 :'95c14da9cafbf828e3e74a6f016d87926ba234ab',
-                 8 :'779e9a0b28f9f832528d4b21e17e168c67697272',
-                 9 :'1f8ff4e5c6ff78ac106fcfe6b1e8cb8740ff9a8f',
-                 10:'131a2ae712cf51ed62f143e3fbac3d4206c25a05',
-                 11:'c5a9d6f520d2515e1ec401a8f8a67e6c3c89f199',
-                 12:'31a2286267f24d8bedaa43355f8ad7129509ea85',
-                 13:'dc2a7fe80e8ec5cae920973973a8ee28b2da5e0a',
-                 14:'2c4b1736566b8ca6051e668de68650686a3922f2',
-                 15:'5912e4ecd9b0c07be4d013e7e2bdcf9323276cde',
-                 16:'b0d2e18d3559a00580f6b49804c23fea500feab3',
-                 17:'8e1d43ad72f7562d7cb8f57ee584e20eb1a69fc7',
-                 18:'5cf64a3459ae28efa60239e44b20312d25b253f3',
-                 19:'1ebed371807ba5935958ad0884595126e8c4e823',
-                 20:'2aa62a8b06fb3b3b892a3292a068ade69d5ee0d3',
-                 21:'01edc447978004f6e4e962b417a4ae1955b6fe5d',
-                 22:'d8d8dc49c4bf0bab401e0298bb5ad827768618bb',
-                 23:'c21f62b1c482862983a8ffb2b0c64b3451876e3f',
-                 24:'c0593fe795e00dff6b3c0fe857a074364d5f04fc',
-                 25:'dd1a1cf2ba9cc225c3aff729953e6364bf1d1855',
+        sha1s = {0: 'da6d3141cb4a5e6f464bf6e0518042ddc7bfd079',
+                 1: '45e21ea146a81ea44a821737acdb4f9791c8abe7',
+                 2: 'e1f11570edf3e2a070052366c582837a4fe4e9fa',
+                 3: '26b4b8626da827088c514b8f9bbe4ebf181edda1',
+                 4: 'e28a5510be25ba84d31121cff00956f9970ae6f6',
+                 5: 'd63ec0ce22e11dcf65a931b69255d3ac747a318d',
+                 6: '2c2888d288cb5e1d98009d822fedfe6019c6a4ea',
+                 7: '95c14da9cafbf828e3e74a6f016d87926ba234ab',
+                 8: '779e9a0b28f9f832528d4b21e17e168c67697272',
+                 9: '1f8ff4e5c6ff78ac106fcfe6b1e8cb8740ff9a8f',
+                 10: '131a2ae712cf51ed62f143e3fbac3d4206c25a05',
+                 11: 'c5a9d6f520d2515e1ec401a8f8a67e6c3c89f199',
+                 12: '31a2286267f24d8bedaa43355f8ad7129509ea85',
+                 13: 'dc2a7fe80e8ec5cae920973973a8ee28b2da5e0a',
+                 14: '2c4b1736566b8ca6051e668de68650686a3922f2',
+                 15: '5912e4ecd9b0c07be4d013e7e2bdcf9323276cde',
+                 16: 'b0d2e18d3559a00580f6b49804c23fea500feab3',
+                 17: '8e1d43ad72f7562d7cb8f57ee584e20eb1a69fc7',
+                 18: '5cf64a3459ae28efa60239e44b20312d25b253f3',
+                 19: '1ebed371807ba5935958ad0884595126e8c4e823',
+                 20: '2aa62a8b06fb3b3b892a3292a068ade69d5ee0d3',
+                 21: '01edc447978004f6e4e962b417a4ae1955b6fe5d',
+                 22: 'd8d8dc49c4bf0bab401e0298bb5ad827768618bb',
+                 23: 'c21f62b1c482862983a8ffb2b0c64b3451876e3f',
+                 24: 'c0593fe795e00dff6b3c0fe857a074364d5f04fc',
+                 25: 'dd1a1cf2ba9cc225c3aff729953e6364bf1d1855',
                  }
         for depth in range(26):
             new_version = self.get_simple_key(text_name + '%s' % depth)
@@ -2784,7 +2784,7 @@
 
     def test_get_parent_map(self):
         self._parent_map = {"G": ("A", "B")}
-        self.assertEqual({("G",): (("A",),("B",))},
+        self.assertEqual({("G",): (("A",), ("B",))},
                           self.texts.get_parent_map([("G",), ("L",)]))
 
     def test_get_record_stream(self):

=== modified file 'breezy/tests/per_workingtree/test_remove.py'
--- breezy/tests/per_workingtree/test_remove.py	2017-06-10 00:17:06 +0000
+++ breezy/tests/per_workingtree/test_remove.py	2017-11-12 14:04:35 +0000
@@ -108,7 +108,7 @@
         tree = self.get_committed_tree(TestRemove.files)
 
         for f in TestRemove.rfiles:
-            tree.rename_one(f,f+'x')
+            tree.rename_one(f, f+'x')
         rfilesx = ['bx/cx', 'bx', 'ax', 'dx']
         self.assertInWorkingTree(rfilesx)
         self.assertPathExists(rfilesx)
@@ -122,10 +122,10 @@
         tree = self.get_committed_tree(TestRemove.files)
 
         for f in TestRemove.rfiles:
-            tree.rename_one(f,f+'x')
+            tree.rename_one(f, f+'x')
         rfilesx = ['bx/cx', 'bx', 'ax', 'dx']
-        self.build_tree_contents([('ax','changed and renamed!'),
-                                  ('bx/cx','changed and renamed!')])
+        self.build_tree_contents([('ax', 'changed and renamed!'),
+                                  ('bx/cx', 'changed and renamed!')])
         self.assertInWorkingTree(rfilesx)
         self.assertPathExists(rfilesx)
 

=== modified file 'breezy/tests/per_workingtree/test_smart_add.py'
--- breezy/tests/per_workingtree/test_smart_add.py	2017-06-10 00:17:06 +0000
+++ breezy/tests/per_workingtree/test_smart_add.py	2017-11-12 14:04:35 +0000
@@ -340,7 +340,7 @@
         self.wt.lock_read()
         self.addCleanup(self.wt.unlock)
         self.assertEqual([('', 'directory'), (u'\xe5', 'file')],
-                         [(path, ie.kind) for path,ie in
+                         [(path, ie.kind) for path, ie in
                           self.wt.iter_entries_by_dir()])
 
     def test_accessible_implicit(self):
@@ -353,7 +353,7 @@
         self.wt.lock_read()
         self.addCleanup(self.wt.unlock)
         self.assertEqual([('', 'directory'), (u'\xe5', 'file')],
-                         [(path, ie.kind) for path,ie
+                         [(path, ie.kind) for path, ie
                           in self.wt.iter_entries_by_dir()])
 
     def test_inaccessible_explicit(self):

=== modified file 'breezy/tests/per_workingtree/test_walkdirs.py'
--- breezy/tests/per_workingtree/test_walkdirs.py	2017-06-10 00:17:06 +0000
+++ breezy/tests/per_workingtree/test_walkdirs.py	2017-11-12 14:04:35 +0000
@@ -84,7 +84,7 @@
         def add_dirblock(path, kind):
             dirblock = DirBlock(tree, path)
             if file_status != self.unknown:
-                dirblock.id = 'a ' + str(path).replace('/','-') + '-id'
+                dirblock.id = 'a ' + str(path).replace('/', '-') + '-id'
                 dirblock.inventory_kind = kind
             if file_status != self.missing:
                 dirblock.disk_kind = kind

=== modified file 'breezy/tests/per_workingtree/test_workingtree.py'
--- breezy/tests/per_workingtree/test_workingtree.py	2017-10-07 22:42:22 +0000
+++ breezy/tests/per_workingtree/test_workingtree.py	2017-11-12 14:04:35 +0000
@@ -819,7 +819,7 @@
             tree.add([u'a\u030a'])
             tree.lock_read()
             self.assertEqual([('', 'directory'), (u'\xe5', 'file')],
-                    [(path, ie.kind) for path,ie in
+                    [(path, ie.kind) for path, ie in
                                 tree.iter_entries_by_dir()])
             tree.unlock()
         finally:

=== modified file 'breezy/tests/test__known_graph.py'
--- breezy/tests/test__known_graph.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test__known_graph.py	2017-11-12 14:04:35 +0000
@@ -462,7 +462,7 @@
              'C': ['A', 'B']},
             'C',
             [('C', 0, (2,), False),
-             ('B', 1, (1,1,1), True),
+             ('B', 1, (1, 1, 1), True),
              ('A', 0, (1,), True),
              ],
             )
@@ -485,8 +485,8 @@
                  }
         self.assertSortAndIterate(graph, 'F',
             [('F', 0, (3,), False),
-             ('D', 1, (2,2,1), False),
-             ('C', 2, (2,1,1), True),
+             ('D', 1, (2, 2, 1), False),
+             ('C', 2, (2, 1, 1), True),
              ('B', 0, (2,), False),
              ('A', 0, (1,), True),
              ])
@@ -508,9 +508,9 @@
                  }
         self.assertSortAndIterate(graph, 'F',
             [('F', 0, (3,), False),
-             ('D', 1, (2,1,2), False),
-             ('C', 2, (2,2,1), True),
-             ('X', 1, (2,1,1), True),
+             ('D', 1, (2, 1, 2), False),
+             ('C', 2, (2, 2, 1), True),
+             ('X', 1, (2, 1, 1), True),
              ('B', 0, (2,), False),
              ('A', 0, (1,), True),
              ])
@@ -539,12 +539,12 @@
              },
             'A',
             [('A', 0, (3,),  False),
-             ('B', 1, (1,3,2), False),
-             ('C', 1, (1,3,1), True),
+             ('B', 1, (1, 3, 2), False),
+             ('C', 1, (1, 3, 1), True),
              ('D', 0, (2,), False),
-             ('E', 1, (1,1,2), False),
-             ('F', 2, (1,2,1), True),
-             ('G', 1, (1,1,1), True),
+             ('E', 1, (1, 1, 2), False),
+             ('F', 2, (1, 2, 1), True),
+             ('G', 1, (1, 1, 1), True),
              ('H', 0, (1,), True),
              ],
             )
@@ -577,14 +577,14 @@
             },
             'L',
             [('L', 0, (6,), False),
-             ('K', 1, (1,3,2), False),
-             ('I', 1, (1,3,1), True),
+             ('K', 1, (1, 3, 2), False),
+             ('I', 1, (1, 3, 1), True),
              ('J', 0, (5,), False),
-             ('H', 1, (1,2,2), False),
-             ('F', 1, (1,2,1), True),
+             ('H', 1, (1, 2, 2), False),
+             ('F', 1, (1, 2, 1), True),
              ('G', 0, (4,), False),
-             ('E', 1, (1,1,2), False),
-             ('C', 1, (1,1,1), True),
+             ('E', 1, (1, 1, 2), False),
+             ('C', 1, (1, 1, 1), True),
              ('D', 0, (3,), False),
              ('B', 0, (2,), False),
              ('A', 0, (1,),  True),
@@ -610,16 +610,16 @@
             },
             'N',
             [('N', 0, (7,), False),
-             ('M', 1, (1,4,1), True),
+             ('M', 1, (1, 4, 1), True),
              ('L', 0, (6,), False),
-             ('K', 1, (1,3,2), False),
-             ('I', 1, (1,3,1), True),
+             ('K', 1, (1, 3, 2), False),
+             ('I', 1, (1, 3, 1), True),
              ('J', 0, (5,), False),
-             ('H', 1, (1,2,2), False),
-             ('F', 1, (1,2,1), True),
+             ('H', 1, (1, 2, 2), False),
+             ('F', 1, (1, 2, 1), True),
              ('G', 0, (4,), False),
-             ('E', 1, (1,1,2), False),
-             ('C', 1, (1,1,1), True),
+             ('E', 1, (1, 1, 2), False),
+             ('C', 1, (1, 1, 1), True),
              ('D', 0, (3,), False),
              ('B', 0, (2,), False),
              ('A', 0, (1,),  True),
@@ -665,12 +665,12 @@
              },
             'A',
             [('A', 0, (2,), False),
-             ('B', 1, (1,3,2), False),
-             ('C', 2, (1,4,1), True),
-             ('D', 1, (1,3,1), True),
-             ('E', 1, (1,1,2), False),
-             ('F', 2, (1,2,1), True),
-             ('G', 1, (1,1,1), True),
+             ('B', 1, (1, 3, 2), False),
+             ('C', 2, (1, 4, 1), True),
+             ('D', 1, (1, 3, 1), True),
+             ('E', 1, (1, 1, 2), False),
+             ('F', 2, (1, 2, 1), True),
+             ('G', 1, (1, 1, 1), True),
              ('H', 0, (1,), True),
              ],
             )
@@ -683,7 +683,7 @@
              'C': ['A', 'B']},
             'C',
             [('C', 0, (2,), False),
-             ('B', 1, (0,1,1), True),
+             ('B', 1, (0, 1, 1), True),
              ('A', 0, (1,), True),
              ],
             )
@@ -721,14 +721,14 @@
              },
             'J',
             [('J', 0, (4,), False),
-             ('I', 1, (1,3,2), False),
-             ('H', 1, (1,3,1), True),
+             ('I', 1, (1, 3, 2), False),
+             ('H', 1, (1, 3, 1), True),
              ('G', 0, (3,), False),
-             ('F', 1, (1,2,2), False),
-             ('E', 1, (1,2,1), True),
+             ('F', 1, (1, 2, 2), False),
+             ('E', 1, (1, 2, 1), True),
              ('D', 0, (2,), False),
-             ('C', 1, (1,1,2), False),
-             ('B', 1, (1,1,1), True),
+             ('C', 1, (1, 1, 2), False),
+             ('B', 1, (1, 1, 1), True),
              ('A', 0, (1,), True),
              ],
             )
@@ -771,20 +771,20 @@
             },
             'R',
             [('R', 0, (6,), False),
-             ('Q', 1, (0,4,5), False),
-             ('P', 2, (0,6,1), True),
-             ('O', 1, (0,4,4), False),
-             ('N', 1, (0,4,3), False),
-             ('M', 2, (0,5,1), True),
-             ('L', 1, (0,4,2), False),
-             ('K', 1, (0,4,1), True),
+             ('Q', 1, (0, 4, 5), False),
+             ('P', 2, (0, 6, 1), True),
+             ('O', 1, (0, 4, 4), False),
+             ('N', 1, (0, 4, 3), False),
+             ('M', 2, (0, 5, 1), True),
+             ('L', 1, (0, 4, 2), False),
+             ('K', 1, (0, 4, 1), True),
              ('J', 0, (5,), False),
-             ('I', 1, (0,3,1), True),
+             ('I', 1, (0, 3, 1), True),
              ('H', 0, (4,), False),
-             ('G', 1, (0,1,3), False),
-             ('F', 2, (0,2,1), True),
-             ('E', 1, (0,1,2), False),
-             ('D', 1, (0,1,1), True),
+             ('G', 1, (0, 1, 3), False),
+             ('F', 2, (0, 2, 1), True),
+             ('E', 1, (0, 1, 2), False),
+             ('D', 1, (0, 1, 1), True),
              ('C', 0, (3,), False),
              ('B', 0, (2,), False),
              ('A', 0, (1,), True),
@@ -880,11 +880,11 @@
                            ('G', 'c'), ('G', 'b'), ('G', 'a'),
                            ('Q', 'c'), ('Q', 'b'), ('Q', 'a'),
                           ],
-                          {('F', 'a'):(), ('F', 'b'): (('F', 'a'),),
+                          {('F', 'a'): (), ('F', 'b'): (('F', 'a'),),
                            ('F', 'c'): (('F', 'b'),),
-                           ('G', 'a'):(), ('G', 'b'): (('G', 'a'),),
+                           ('G', 'a'): (), ('G', 'b'): (('G', 'a'),),
                            ('G', 'c'): (('G', 'b'),),
-                           ('Q', 'a'):(), ('Q', 'b'): (('Q', 'a'),),
+                           ('Q', 'a'): (), ('Q', 'b'): (('Q', 'a'),),
                            ('Q', 'c'): (('Q', 'b'),),
                           })
 
@@ -900,10 +900,10 @@
                           {'a':(), 'b':('a',), 'c':('a',), 'd':('a',),
                            'Z':('a',)})
         self.assertSorted(['e', 'b', 'c', 'f', 'Z', 'd', 'a'],
-                          {'a':(), 'b':('a',), 'c':('a',), 'd':('a',),
-                           'Z':('a',),
-                           'e':('b', 'c', 'd'),
-                           'f':('d', 'Z'),
+                          {'a': (), 'b': ('a',), 'c': ('a',), 'd': ('a',),
+                           'Z': ('a',),
+                           'e': ('b', 'c', 'd'),
+                           'f': ('d', 'Z'),
                            })
 
     def test_skip_ghost(self):

=== modified file 'breezy/tests/test_bisect_multi.py'
--- breezy/tests/test_bisect_multi.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_bisect_multi.py	2017-11-12 14:04:35 +0000
@@ -84,7 +84,7 @@
         # steps in the worst case there.
         self.assertEqual([],
             list(bisect_multi_bytes(
-                missing_first_content,268435456 - 1 , ['foo', 'bar'])))
+                missing_first_content, 268435456 - 1, ['foo', 'bar'])))
         self.assertEqual([
             [(134217727, 'foo'), (134217727, 'bar')],
             [(67108864, 'foo'), (67108864, 'bar')],
@@ -177,7 +177,7 @@
         # assertion.
         self.assertEqual([],
             list(bisect_multi_bytes(
-                missing_last_content,268435456 - 1 , ['foo', 'bar'])))
+                missing_last_content, 268435456 - 1, ['foo', 'bar'])))
         self.assertEqual([
             [(134217727, 'foo'), (134217727, 'bar')],
             [(201326590, 'foo'), (201326590, 'bar')],

=== modified file 'breezy/tests/test_bundle.py'
--- breezy/tests/test_bundle.py	2017-06-10 16:40:42 +0000
+++ breezy/tests/test_bundle.py	2017-11-12 14:04:35 +0000
@@ -118,7 +118,7 @@
         return kind
 
     def make_entry(self, file_id, path):
-        from ..bzr.inventory import (InventoryFile , InventoryDirectory,
+        from ..bzr.inventory import (InventoryFile, InventoryDirectory,
             InventoryLink)
         name = os.path.basename(path)
         kind = self.kind(file_id)
@@ -156,7 +156,7 @@
     def get_file(self, file_id):
         result = BytesIO()
         result.write(self.contents[file_id])
-        result.seek(0,0)
+        result.seek(0, 0)
         return result
 
     def get_file_revision(self, file_id):
@@ -260,7 +260,7 @@
     def unified_diff(self, old, new):
         out = BytesIO()
         diff.internal_diff("old", old, "new", new, out)
-        out.seek(0,0)
+        out.seek(0, 0)
         return out.read()
 
     def make_tree_2(self):
@@ -709,7 +709,7 @@
         tt.apply()
         self.tree1.commit('add symlink', rev_id='l@cset-0-1')
         bundle = self.get_valid_bundle('null:', 'l@cset-0-1')
-        if getattr(bundle ,'revision_tree', None) is not None:
+        if getattr(bundle, 'revision_tree', None) is not None:
             # Not all bundle formats supports revision_tree
             bund_tree = bundle.revision_tree(self.b1.repository, 'l@cset-0-1')
             self.assertEqual(link_target, bund_tree.get_symlink_target(link_id))
@@ -722,7 +722,7 @@
         tt.apply()
         self.tree1.commit('rename and change symlink', rev_id='l@cset-0-2')
         bundle = self.get_valid_bundle('l@cset-0-1', 'l@cset-0-2')
-        if getattr(bundle ,'revision_tree', None) is not None:
+        if getattr(bundle, 'revision_tree', None) is not None:
             # Not all bundle formats supports revision_tree
             bund_tree = bundle.revision_tree(self.b1.repository, 'l@cset-0-2')
             self.assertEqual(new_link_target,

=== modified file 'breezy/tests/test_chk_map.py'
--- breezy/tests/test_chk_map.py	2017-06-08 23:30:31 +0000
+++ breezy/tests/test_chk_map.py	2017-11-12 14:04:35 +0000
@@ -1155,7 +1155,7 @@
 
     def test_iteritems_keys_prefixed_by_2_width_nodes(self):
         chkmap = self._get_map(
-            {("a","a"):"content here", ("a", "b",):"more content",
+            {("a", "a"):"content here", ("a", "b",):"more content",
              ("b", ""): 'boring content'},
             maximum_size=10, key_width=2)
         self.assertEqual(
@@ -1171,7 +1171,7 @@
         self.assertEqual('71BEEFF9\x0000000000',
                          search_key_func(StaticTuple('b', '')))
         chkmap = self._get_map(
-            {("a","a"):"content here", ("a", "b",):"more content",
+            {("a", "a"):"content here", ("a", "b",):"more content",
              ("b", ""): 'boring content'},
             maximum_size=10, key_width=2, search_key_func=search_key_func)
         self.assertEqual(
@@ -1180,7 +1180,7 @@
 
     def test_iteritems_keys_prefixed_by_2_width_one_leaf(self):
         chkmap = self._get_map(
-            {("a","a"):"content here", ("a", "b",):"more content",
+            {("a", "a"):"content here", ("a", "b",):"more content",
              ("b", ""): 'boring content'}, key_width=2)
         self.assertEqual(
             {("a", "a"): "content here", ("a", "b"): 'more content'},

=== modified file 'breezy/tests/test_clean_tree.py'
--- breezy/tests/test_clean_tree.py	2017-06-10 00:17:06 +0000
+++ breezy/tests/test_clean_tree.py	2017-11-12 14:04:35 +0000
@@ -65,17 +65,17 @@
             transport.put_bytes('file', 'contents')
             transport.put_bytes('file~', 'contents')
             transport.put_bytes('file.pyc', 'contents')
-            dels = sorted([r for a,r in iter_deletables(tree, unknown=True)])
+            dels = sorted([r for a, r in iter_deletables(tree, unknown=True)])
             self.assertEqual(['file', 'file.BASE'], dels)
 
-            dels = [r for a,r in iter_deletables(tree, detritus=True)]
+            dels = [r for a, r in iter_deletables(tree, detritus=True)]
             self.assertEqual(sorted(['file~', 'file.BASE']), dels)
 
-            dels = [r for a,r in iter_deletables(tree, ignored=True)]
+            dels = [r for a, r in iter_deletables(tree, ignored=True)]
             self.assertEqual(sorted(['file~', 'file.pyc', '.bzrignore']),
                              dels)
 
-            dels = [r for a,r in iter_deletables(tree, unknown=False)]
+            dels = [r for a, r in iter_deletables(tree, unknown=False)]
             self.assertEqual([], dels)
         finally:
             tree.unlock()

=== modified file 'breezy/tests/test_config.py'
--- breezy/tests/test_config.py	2017-10-27 00:18:42 +0000
+++ breezy/tests/test_config.py	2017-11-12 14:04:35 +0000
@@ -765,7 +765,7 @@
         return c
 
     def test_dont_cross_unrelated_section(self):
-        c = self.get_config('/another/branch/path','''
+        c = self.get_config('/another/branch/path', '''
 [/one/branch/path]
 foo = hello
 bar = {foo}/2
@@ -777,7 +777,7 @@
                           c.get_user_option, 'bar', expand=True)
 
     def test_cross_related_sections(self):
-        c = self.get_config('/project/branch/path','''
+        c = self.get_config('/project/branch/path', '''
 [/project]
 foo = qu
 
@@ -1913,7 +1913,7 @@
         # caused by the differences in implementations betwen
         # SmartServerBzrDirRequestConfigFile (in smart/bzrdir.py) and
         # SmartServerBranchGetConfigFile (in smart/branch.py)
-        self.assertLoadHook(2 ,'file', remote.RemoteBzrDirConfig, remote_bzrdir)
+        self.assertLoadHook(2, 'file', remote.RemoteBzrDirConfig, remote_bzrdir)
 
     def assertSaveHook(self, conf):
         calls = []
@@ -3797,7 +3797,7 @@
         return c
 
     def test_dont_cross_unrelated_section(self):
-        c = self.get_config('/another/branch/path','''
+        c = self.get_config('/another/branch/path', '''
 [/one/branch/path]
 foo = hello
 bar = {foo}/2
@@ -3809,7 +3809,7 @@
                           c.get, 'bar', expand=True)
 
     def test_cross_related_sections(self):
-        c = self.get_config('/project/branch/path','''
+        c = self.get_config('/project/branch/path', '''
 [/project]
 foo = qu
 
@@ -4332,7 +4332,7 @@
                               conf, 'http', host='bar.org', path='/dir2')
         # matching subdir
         self._got_user_passwd('jim', 'jimpass',
-                              conf, 'http', host='bar.org',path='/dir1/subdir')
+                              conf, 'http', host='bar.org', path='/dir1/subdir')
 
     def test_credentials_for_user(self):
         conf = config.AuthenticationConfig(_file=BytesIO(b"""

=== modified file 'breezy/tests/test_conflicts.py'
--- breezy/tests/test_conflicts.py	2017-07-14 21:15:49 +0000
+++ breezy/tests/test_conflicts.py	2017-11-12 14:04:35 +0000
@@ -1061,7 +1061,7 @@
         # trunk switched. As such it should certainly produce the same
         # conflict.
         self.assertRaises(errors.MalformedTransform,
-                          self.run_script,"""
+                          self.run_script, """
 $ brz init trunk
 ...
 $ cd trunk

=== modified file 'breezy/tests/test_delta.py'
--- breezy/tests/test_delta.py	2017-05-24 20:47:06 +0000
+++ breezy/tests/test_delta.py	2017-11-12 14:04:35 +0000
@@ -136,12 +136,12 @@
             "Operating on whole tree but only reporting on 'my' view.",
             " M  path"]
         self.assertReportLines(expected_lines, modified='modified',
-            view_info=('my',['path']))
+            view_info=('my', ['path']))
         # If a file in outside the view, it should not appear in the output
         expected_lines = [
             "Operating on whole tree but only reporting on 'my' view."]
         self.assertReportLines(expected_lines, modified='modified',
-            path="foo", view_info=('my',['path']))
+            path="foo", view_info=('my', ['path']))
 
     def assertChangesEqual(self,
                            file_id='fid',

=== modified file 'breezy/tests/test_diff.py'
--- breezy/tests/test_diff.py	2017-10-27 00:18:42 +0000
+++ breezy/tests/test_diff.py	2017-11-12 14:04:35 +0000
@@ -150,9 +150,9 @@
     def test_binary_lines(self):
         empty = []
         uni_lines = [1023 * 'a' + '\x00']
-        self.assertRaises(errors.BinaryFile, udiff_lines, uni_lines , empty)
+        self.assertRaises(errors.BinaryFile, udiff_lines, uni_lines, empty)
         self.assertRaises(errors.BinaryFile, udiff_lines, empty, uni_lines)
-        udiff_lines(uni_lines , empty, allow_binary=True)
+        udiff_lines(uni_lines, empty, allow_binary=True)
         udiff_lines(empty, uni_lines, allow_binary=True)
 
     def test_external_diff(self):
@@ -254,10 +254,10 @@
 
     def test_internal_diff_default_context(self):
         output = BytesIO()
-        diff.internal_diff('old', ['same_text\n','same_text\n','same_text\n',
-                           'same_text\n','same_text\n','old_text\n'],
-                           'new', ['same_text\n','same_text\n','same_text\n',
-                           'same_text\n','same_text\n','new_text\n'], output)
+        diff.internal_diff('old', ['same_text\n', 'same_text\n', 'same_text\n',
+                           'same_text\n', 'same_text\n', 'old_text\n'],
+                           'new', ['same_text\n', 'same_text\n', 'same_text\n',
+                           'same_text\n', 'same_text\n', 'new_text\n'], output)
         lines = output.getvalue().splitlines(True)
         self.check_patch(lines)
         self.assertEqual(['--- old\n',
@@ -274,10 +274,10 @@
 
     def test_internal_diff_no_context(self):
         output = BytesIO()
-        diff.internal_diff('old', ['same_text\n','same_text\n','same_text\n',
-                           'same_text\n','same_text\n','old_text\n'],
-                           'new', ['same_text\n','same_text\n','same_text\n',
-                           'same_text\n','same_text\n','new_text\n'], output,
+        diff.internal_diff('old', ['same_text\n', 'same_text\n', 'same_text\n',
+                           'same_text\n', 'same_text\n', 'old_text\n'],
+                           'new', ['same_text\n', 'same_text\n', 'same_text\n',
+                           'same_text\n', 'same_text\n', 'new_text\n'], output,
                            context_lines=0)
         lines = output.getvalue().splitlines(True)
         self.check_patch(lines)
@@ -292,10 +292,10 @@
 
     def test_internal_diff_more_context(self):
         output = BytesIO()
-        diff.internal_diff('old', ['same_text\n','same_text\n','same_text\n',
-                           'same_text\n','same_text\n','old_text\n'],
-                           'new', ['same_text\n','same_text\n','same_text\n',
-                           'same_text\n','same_text\n','new_text\n'], output,
+        diff.internal_diff('old', ['same_text\n', 'same_text\n', 'same_text\n',
+                           'same_text\n', 'same_text\n', 'old_text\n'],
+                           'new', ['same_text\n', 'same_text\n', 'same_text\n',
+                           'same_text\n', 'same_text\n', 'new_text\n'], output,
                            context_lines=4)
         lines = output.getvalue().splitlines(True)
         self.check_patch(lines)
@@ -886,14 +886,14 @@
         self.assertEqual(unique_lcs('', ''), [])
         self.assertEqual(unique_lcs('', 'a'), [])
         self.assertEqual(unique_lcs('a', ''), [])
-        self.assertEqual(unique_lcs('a', 'a'), [(0,0)])
+        self.assertEqual(unique_lcs('a', 'a'), [(0, 0)])
         self.assertEqual(unique_lcs('a', 'b'), [])
-        self.assertEqual(unique_lcs('ab', 'ab'), [(0,0), (1,1)])
-        self.assertEqual(unique_lcs('abcde', 'cdeab'), [(2,0), (3,1), (4,2)])
-        self.assertEqual(unique_lcs('cdeab', 'abcde'), [(0,2), (1,3), (2,4)])
-        self.assertEqual(unique_lcs('abXde', 'abYde'), [(0,0), (1,1),
-                                                         (3,3), (4,4)])
-        self.assertEqual(unique_lcs('acbac', 'abc'), [(2,1)])
+        self.assertEqual(unique_lcs('ab', 'ab'), [(0, 0), (1, 1)])
+        self.assertEqual(unique_lcs('abcde', 'cdeab'), [(2, 0), (3, 1), (4, 2)])
+        self.assertEqual(unique_lcs('cdeab', 'abcde'), [(0, 2), (1, 3), (2, 4)])
+        self.assertEqual(unique_lcs('abXde', 'abYde'), [(0, 0), (1, 1),
+                                                         (3, 3), (4, 4)])
+        self.assertEqual(unique_lcs('acbac', 'abc'), [(2, 1)])
 
     def test_recurse_matches(self):
         def test_one(a, b, matches):
@@ -909,7 +909,7 @@
         # Even though 'bc' is not unique globally, and is surrounded by
         # non-matching lines, we should still match, because they are locally
         # unique
-        test_one('abcdbce', 'afbcgdbce', [(0,0), (1, 2), (2, 3), (3, 5),
+        test_one('abcdbce', 'afbcgdbce', [(0, 0), (1, 2), (2, 3), (3, 5),
                                           (4, 6), (5, 7), (6, 8)])
 
         # recurse_matches doesn't match non-unique
@@ -920,7 +920,7 @@
         #test_one('aBccDe', 'abccde', [(0,0), (2,2), (3,3), (5,5)])
 
         # This is what it currently gives:
-        test_one('aBccDe', 'abccde', [(0,0), (5,5)])
+        test_one('aBccDe', 'abccde', [(0, 0), (5, 5)])
 
     def assertDiffBlocks(self, a, b, expected_blocks):
         """Check that the sequence matcher returns the correct blocks.
@@ -968,19 +968,19 @@
 
         # non unique lines surrounded by non-matching lines
         # won't be found
-        self.assertDiffBlocks('aBccDe', 'abccde', [(0,0,1), (5,5,1)])
+        self.assertDiffBlocks('aBccDe', 'abccde', [(0, 0, 1), (5, 5, 1)])
 
         # But they only need to be locally unique
-        self.assertDiffBlocks('aBcDec', 'abcdec', [(0,0,1), (2,2,1), (4,4,2)])
+        self.assertDiffBlocks('aBcDec', 'abcdec', [(0, 0, 1), (2, 2, 1), (4, 4, 2)])
 
         # non unique blocks won't be matched
-        self.assertDiffBlocks('aBcdEcdFg', 'abcdecdfg', [(0,0,1), (8,8,1)])
+        self.assertDiffBlocks('aBcdEcdFg', 'abcdecdfg', [(0, 0, 1), (8, 8, 1)])
 
         # but locally unique ones will
-        self.assertDiffBlocks('aBcdEeXcdFg', 'abcdecdfg', [(0,0,1), (2,2,2),
-                                              (5,4,1), (7,5,2), (10,8,1)])
+        self.assertDiffBlocks('aBcdEeXcdFg', 'abcdecdfg', [(0, 0, 1), (2, 2, 2),
+                                              (5, 4, 1), (7, 5, 2), (10, 8, 1)])
 
-        self.assertDiffBlocks('abbabbXd', 'cabbabxd', [(7,7,1)])
+        self.assertDiffBlocks('abbabbXd', 'cabbabxd', [(7, 7, 1)])
         self.assertDiffBlocks('abbabbbb', 'cabbabbc', [])
         self.assertDiffBlocks('bbbbbbbb', 'cbbbbbbc', [])
 
@@ -1015,35 +1015,35 @@
 
         chk_ops('', '', [])
         chk_ops([], [], [])
-        chk_ops('abc', '', [('delete', 0,3, 0,0)])
-        chk_ops('', 'abc', [('insert', 0,0, 0,3)])
-        chk_ops('abcd', 'abcd', [('equal',    0,4, 0,4)])
-        chk_ops('abcd', 'abce', [('equal',   0,3, 0,3),
-                                 ('replace', 3,4, 3,4)
-                                ])
-        chk_ops('eabc', 'abce', [('delete', 0,1, 0,0),
-                                 ('equal',  1,4, 0,3),
-                                 ('insert', 4,4, 3,4)
-                                ])
-        chk_ops('eabce', 'abce', [('delete', 0,1, 0,0),
-                                  ('equal',  1,5, 0,4)
+        chk_ops('abc', '', [('delete', 0, 3, 0, 0)])
+        chk_ops('', 'abc', [('insert', 0, 0, 0, 3)])
+        chk_ops('abcd', 'abcd', [('equal',    0, 4, 0, 4)])
+        chk_ops('abcd', 'abce', [('equal',   0, 3, 0, 3),
+                                 ('replace', 3, 4, 3, 4)
+                                ])
+        chk_ops('eabc', 'abce', [('delete', 0, 1, 0, 0),
+                                 ('equal',  1, 4, 0, 3),
+                                 ('insert', 4, 4, 3, 4)
+                                ])
+        chk_ops('eabce', 'abce', [('delete', 0, 1, 0, 0),
+                                  ('equal',  1, 5, 0, 4)
                                  ])
-        chk_ops('abcde', 'abXde', [('equal',   0,2, 0,2),
-                                   ('replace', 2,3, 2,3),
-                                   ('equal',   3,5, 3,5)
+        chk_ops('abcde', 'abXde', [('equal',   0, 2, 0, 2),
+                                   ('replace', 2, 3, 2, 3),
+                                   ('equal',   3, 5, 3, 5)
                                   ])
-        chk_ops('abcde', 'abXYZde', [('equal',   0,2, 0,2),
-                                     ('replace', 2,3, 2,5),
-                                     ('equal',   3,5, 5,7)
+        chk_ops('abcde', 'abXYZde', [('equal',   0, 2, 0, 2),
+                                     ('replace', 2, 3, 2, 5),
+                                     ('equal',   3, 5, 5, 7)
                                     ])
-        chk_ops('abde', 'abXYZde', [('equal',  0,2, 0,2),
-                                    ('insert', 2,2, 2,5),
-                                    ('equal',  2,4, 5,7)
+        chk_ops('abde', 'abXYZde', [('equal',  0, 2, 0, 2),
+                                    ('insert', 2, 2, 2, 5),
+                                    ('equal',  2, 4, 5, 7)
                                    ])
         chk_ops('abcdefghijklmnop', 'abcdefxydefghijklmnop',
-                [('equal',  0,6,  0,6),
-                 ('insert', 6,6,  6,11),
-                 ('equal',  6,16, 11,21)
+                [('equal',  0, 6,  0, 6),
+                 ('insert', 6, 6,  6, 11),
+                 ('equal',  6, 16, 11, 21)
                 ])
         chk_ops(
                 [ 'hello there\n'
@@ -1051,37 +1051,37 @@
                 , 'how are you today?\n'],
                 [ 'hello there\n'
                 , 'how are you today?\n'],
-                [('equal',  0,1, 0,1),
-                 ('delete', 1,2, 1,1),
-                 ('equal',  2,3, 1,2),
+                [('equal',  0, 1, 0, 1),
+                 ('delete', 1, 2, 1, 1),
+                 ('equal',  2, 3, 1, 2),
                 ])
         chk_ops('aBccDe', 'abccde',
-                [('equal',   0,1, 0,1),
-                 ('replace', 1,5, 1,5),
-                 ('equal',   5,6, 5,6),
+                [('equal',   0, 1, 0, 1),
+                 ('replace', 1, 5, 1, 5),
+                 ('equal',   5, 6, 5, 6),
                 ])
         chk_ops('aBcDec', 'abcdec',
-                [('equal',   0,1, 0,1),
-                 ('replace', 1,2, 1,2),
-                 ('equal',   2,3, 2,3),
-                 ('replace', 3,4, 3,4),
-                 ('equal',   4,6, 4,6),
+                [('equal',   0, 1, 0, 1),
+                 ('replace', 1, 2, 1, 2),
+                 ('equal',   2, 3, 2, 3),
+                 ('replace', 3, 4, 3, 4),
+                 ('equal',   4, 6, 4, 6),
                 ])
         chk_ops('aBcdEcdFg', 'abcdecdfg',
-                [('equal',   0,1, 0,1),
-                 ('replace', 1,8, 1,8),
-                 ('equal',   8,9, 8,9)
+                [('equal',   0, 1, 0, 1),
+                 ('replace', 1, 8, 1, 8),
+                 ('equal',   8, 9, 8, 9)
                 ])
         chk_ops('aBcdEeXcdFg', 'abcdecdfg',
-                [('equal',   0,1, 0,1),
-                 ('replace', 1,2, 1,2),
-                 ('equal',   2,4, 2,4),
-                 ('delete', 4,5, 4,4),
-                 ('equal',   5,6, 4,5),
-                 ('delete', 6,7, 5,5),
-                 ('equal',   7,9, 5,7),
-                 ('replace', 9,10, 7,8),
-                 ('equal',   10,11, 8,9)
+                [('equal',   0, 1, 0, 1),
+                 ('replace', 1, 2, 1, 2),
+                 ('equal',   2, 4, 2, 4),
+                 ('delete', 4, 5, 4, 4),
+                 ('equal',   5, 6, 4, 5),
+                 ('delete', 6, 7, 5, 5),
+                 ('equal',   7, 9, 5, 7),
+                 ('replace', 9, 10, 7, 8),
+                 ('equal',   10, 11, 8, 9)
                 ])
 
     def test_grouped_opcodes(self):
@@ -1091,33 +1091,33 @@
 
         chk_ops('', '', [])
         chk_ops([], [], [])
-        chk_ops('abc', '', [[('delete', 0,3, 0,0)]])
-        chk_ops('', 'abc', [[('insert', 0,0, 0,3)]])
+        chk_ops('abc', '', [[('delete', 0, 3, 0, 0)]])
+        chk_ops('', 'abc', [[('insert', 0, 0, 0, 3)]])
         chk_ops('abcd', 'abcd', [])
-        chk_ops('abcd', 'abce', [[('equal',   0,3, 0,3),
-                                  ('replace', 3,4, 3,4)
+        chk_ops('abcd', 'abce', [[('equal',   0, 3, 0, 3),
+                                  ('replace', 3, 4, 3, 4)
                                  ]])
-        chk_ops('eabc', 'abce', [[('delete', 0,1, 0,0),
-                                 ('equal',  1,4, 0,3),
-                                 ('insert', 4,4, 3,4)
+        chk_ops('eabc', 'abce', [[('delete', 0, 1, 0, 0),
+                                 ('equal',  1, 4, 0, 3),
+                                 ('insert', 4, 4, 3, 4)
                                 ]])
         chk_ops('abcdefghijklmnop', 'abcdefxydefghijklmnop',
-                [[('equal',  3,6, 3,6),
-                  ('insert', 6,6, 6,11),
-                  ('equal',  6,9, 11,14)
+                [[('equal',  3, 6, 3, 6),
+                  ('insert', 6, 6, 6, 11),
+                  ('equal',  6, 9, 11, 14)
                   ]])
         chk_ops('abcdefghijklmnop', 'abcdefxydefghijklmnop',
-                [[('equal',  2,6, 2,6),
-                  ('insert', 6,6, 6,11),
-                  ('equal',  6,10, 11,15)
+                [[('equal',  2, 6, 2, 6),
+                  ('insert', 6, 6, 6, 11),
+                  ('equal',  6, 10, 11, 15)
                   ]], 4)
         chk_ops('Xabcdef', 'abcdef',
-                [[('delete', 0,1, 0,0),
-                  ('equal',  1,4, 0,3)
+                [[('delete', 0, 1, 0, 0),
+                  ('equal',  1, 4, 0, 3)
                   ]])
         chk_ops('abcdef', 'abcdefX',
-                [[('equal',  3,6, 3,6),
-                  ('insert', 6,6, 6,7)
+                [[('equal',  3, 6, 3, 6),
+                  ('insert', 6, 6, 6, 7)
                   ]])
 
 
@@ -1130,7 +1130,7 @@
 
         self.assertDiffBlocks('ABCd efghIjk  L',
                               'AxyzBCn mo pqrstuvwI1 2  L',
-                              [(0,0,1), (1, 4, 2), (9, 19, 1), (12, 23, 3)])
+                              [(0, 0, 1), (1, 4, 2), (9, 19, 1), (12, 23, 3)])
 
         # These are rot13 code snippets.
         self.assertDiffBlocks('''\
@@ -1177,7 +1177,7 @@
 
 pynff pzq_zxqve(Pbzznaq):
 '''.splitlines(True)
-, [(0,0,1), (1, 4, 2), (9, 19, 1), (12, 23, 3)])
+, [(0, 0, 1), (1, 4, 2), (9, 19, 1), (12, 23, 3)])
 
     def test_patience_unified_diff(self):
         txt_a = ['hello there\n',

=== modified file 'breezy/tests/test_dirstate.py'
--- breezy/tests/test_dirstate.py	2017-07-30 21:23:44 +0000
+++ breezy/tests/test_dirstate.py	2017-11-12 14:04:35 +0000
@@ -255,35 +255,35 @@
         f_len = len(f_text)
         null_stat = dirstate.DirState.NULLSTAT
         expected = {
-            '':(('', '', 'TREE_ROOT'), [
+            '': (('', '', 'TREE_ROOT'), [
                   ('d', '', 0, False, null_stat),
                   ('d', '', 0, False, revision_id),
                 ]),
-            'a':(('', 'a', 'a-id'), [
+            'a': (('', 'a', 'a-id'), [
                    ('f', '', 0, False, null_stat),
                    ('f', a_sha, a_len, False, revision_id),
                  ]),
-            'b':(('', 'b', 'b-id'), [
+            'b': (('', 'b', 'b-id'), [
                   ('d', '', 0, False, null_stat),
                   ('d', '', 0, False, revision_id),
                  ]),
-            'b/c':(('b', 'c', 'c-id'), [
+            'b/c': (('b', 'c', 'c-id'), [
                     ('f', '', 0, False, null_stat),
                     ('f', c_sha, c_len, False, revision_id),
                    ]),
-            'b/d':(('b', 'd', 'd-id'), [
+            'b/d': (('b', 'd', 'd-id'), [
                     ('d', '', 0, False, null_stat),
                     ('d', '', 0, False, revision_id),
                    ]),
-            'b/d/e':(('b/d', 'e', 'e-id'), [
+            'b/d/e': (('b/d', 'e', 'e-id'), [
                       ('f', '', 0, False, null_stat),
                       ('f', e_sha, e_len, False, revision_id),
                      ]),
-            'b-c':(('', 'b-c', 'b-c-id'), [
+            'b-c': (('', 'b-c', 'b-c-id'), [
                       ('f', '', 0, False, null_stat),
                       ('f', b_c_sha, b_c_len, False, revision_id),
                      ]),
-            'f':(('', 'f', 'f-id'), [
+            'f': (('', 'f', 'f-id'), [
                   ('f', '', 0, False, null_stat),
                   ('f', f_sha, f_len, False, revision_id),
                  ]),
@@ -2027,15 +2027,15 @@
         """Test bisect when there is only 1 page to read"""
         tree, state, expected = self.create_basic_dirstate()
         state._bisect_page_size = 5000
-        self.assertBisect(expected,[['']], state, [''])
-        self.assertBisect(expected,[['a']], state, ['a'])
-        self.assertBisect(expected,[['b']], state, ['b'])
-        self.assertBisect(expected,[['b/c']], state, ['b/c'])
-        self.assertBisect(expected,[['b/d']], state, ['b/d'])
-        self.assertBisect(expected,[['b/d/e']], state, ['b/d/e'])
-        self.assertBisect(expected,[['b-c']], state, ['b-c'])
-        self.assertBisect(expected,[['f']], state, ['f'])
-        self.assertBisect(expected,[['a'], ['b'], ['f']],
+        self.assertBisect(expected, [['']], state, [''])
+        self.assertBisect(expected, [['a']], state, ['a'])
+        self.assertBisect(expected, [['b']], state, ['b'])
+        self.assertBisect(expected, [['b/c']], state, ['b/c'])
+        self.assertBisect(expected, [['b/d']], state, ['b/d'])
+        self.assertBisect(expected, [['b/d/e']], state, ['b/d/e'])
+        self.assertBisect(expected, [['b-c']], state, ['b-c'])
+        self.assertBisect(expected, [['f']], state, ['f'])
+        self.assertBisect(expected, [['a'], ['b'], ['f']],
                           state, ['a', 'b', 'f'])
         self.assertBisect(expected, [['b/d'], ['b/d/e'], ['f']],
                           state, ['b/d', 'b/d/e', 'f'])

=== modified file 'breezy/tests/test_email_message.py'
--- breezy/tests/test_email_message.py	2017-09-26 00:55:04 +0000
+++ breezy/tests/test_email_message.py	2017-11-12 14:04:35 +0000
@@ -106,7 +106,7 @@
 
     def test_empty_message(self):
         msg = EmailMessage('[e-mail]', '[e-mail]', 'subject')
-        self.assertEqualDiff(EMPTY_MESSAGE , msg.as_string())
+        self.assertEqualDiff(EMPTY_MESSAGE, msg.as_string())
 
     def test_simple_message(self):
         pairs = {

=== modified file 'breezy/tests/test_eol_filters.py'
--- breezy/tests/test_eol_filters.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_eol_filters.py	2017-11-12 14:04:35 +0000
@@ -47,7 +47,7 @@
 
     def test_exact_value(self):
         """'eol = exact' should have no content filters"""
-        prefs = (('eol','exact'),)
+        prefs = (('eol', 'exact'),)
         self.assertEqual([], _get_filter_stack_for(prefs))
 
     def test_other_known_values(self):
@@ -56,14 +56,14 @@
             'native-with-crlf-in-repo', 'lf-with-crlf-in-repo',
             'crlf-with-crlf-in-repo')
         for value in known_values:
-            prefs = (('eol',value),)
+            prefs = (('eol', value),)
             self.assertNotEqual([], _get_filter_stack_for(prefs))
 
     def test_unknown_value(self):
         """
         Unknown eol values should raise an error.
         """
-        prefs = (('eol','unknown-value'),)
+        prefs = (('eol', 'unknown-value'),)
         self.assertRaises(errors.BzrError, _get_filter_stack_for,  prefs)
 
     def test_eol_missing_altogether_is_ok(self):

=== modified file 'breezy/tests/test_filters.py'
--- breezy/tests/test_filters.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_filters.py	2017-11-12 14:04:35 +0000
@@ -105,7 +105,7 @@
         post_filtered_content = ''.join(_swapcase([text], None))
         expected_len = len(post_filtered_content)
         expected_sha = sha_string(post_filtered_content)
-        self.assertEqual((expected_len,expected_sha),
+        self.assertEqual((expected_len, expected_sha),
             internal_size_sha_file_byname('a',
             [ContentFilter(_swapcase, _swapcase)]))
 
@@ -142,18 +142,18 @@
         z_stack = [ContentFilter('y', 'x'), ContentFilter('w', 'v')]
         self._register_map('foo', a_stack, z_stack)
         self._register_map('bar', d_stack, z_stack)
-        prefs = (('foo','v1'),)
+        prefs = (('foo', 'v1'),)
         self.assertEqual(a_stack, _get_filter_stack_for(prefs))
-        prefs = (('foo','v2'),)
+        prefs = (('foo', 'v2'),)
         self.assertEqual(z_stack, _get_filter_stack_for(prefs))
-        prefs = (('foo','v1'), ('bar','v1'))
+        prefs = (('foo', 'v1'), ('bar', 'v1'))
         self.assertEqual(a_stack + d_stack, _get_filter_stack_for(prefs))
         # Test an unknown preference
-        prefs = (('baz','v1'),)
+        prefs = (('baz', 'v1'),)
         self.assertEqual([], _get_filter_stack_for(prefs))
         # Test an unknown value
-        prefs = (('foo','v3'),)
+        prefs = (('foo', 'v3'),)
         self.assertEqual([], _get_filter_stack_for(prefs))
         # Test a value of None is skipped
-        prefs = (('foo',None), ('bar', 'v1'))
+        prefs = (('foo', None), ('bar', 'v1'))
         self.assertEqual(d_stack, _get_filter_stack_for(prefs))

=== modified file 'breezy/tests/test_foreign.py'
--- breezy/tests/test_foreign.py	2017-08-09 23:17:39 +0000
+++ breezy/tests/test_foreign.py	2017-11-12 14:04:35 +0000
@@ -91,7 +91,7 @@
         return "%s|%s|%s" % foreign_revid
 
 
-class DummyForeignVcsBranch(bzrbranch.BzrBranch6,foreign.ForeignBranch):
+class DummyForeignVcsBranch(bzrbranch.BzrBranch6, foreign.ForeignBranch):
     """A Dummy VCS Branch."""
 
     @property

=== modified file 'breezy/tests/test_generate_ids.py'
--- breezy/tests/test_generate_ids.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_generate_ids.py	2017-11-12 14:04:35 +0000
@@ -130,7 +130,7 @@
     def test_gen_revision_id_email(self):
         """gen_revision_id uses email address if present"""
         regex = r'user\+joe_bar@foo-bar\.com-\d{14}-[a-z0-9]{16}'
-        self.assertGenRevisionId(regex,'[e-mail]')
+        self.assertGenRevisionId(regex, '[e-mail]')
         self.assertGenRevisionId(regex, '<[e-mail]>')
         self.assertGenRevisionId(regex, 'Joe Bar <[e-mail]>')
         self.assertGenRevisionId(regex, 'Joe Bar <[e-mail]>')

=== modified file 'breezy/tests/test_globbing.py'
--- breezy/tests/test_globbing.py	2017-10-27 00:18:42 +0000
+++ breezy/tests/test_globbing.py	2017-11-12 14:04:35 +0000
@@ -307,10 +307,10 @@
         patterns = [u'*.%03d' % i for i in range(300)]
         globster = Globster(patterns)
         # test the fence posts
-        for x in (0,98,99,197,198,296,297,299):
+        for x in (0, 98, 99, 197, 198, 296, 297, 299):
             filename = u'foo.%03d' % x
-            self.assertEqual(patterns[x],globster.match(filename))
-        self.assertEqual(None,globster.match('foobar.300'))
+            self.assertEqual(patterns[x], globster.match(filename))
+        self.assertEqual(None, globster.match('foobar.300'))
 
     def test_bad_pattern(self):
         """Ensure that globster handles bad patterns cleanly."""
@@ -325,7 +325,7 @@
 
     def test_exclusion_patterns(self):
         """test that exception patterns are not matched"""
-        patterns = [ u'*', u'!./local', u'!./local/**/*', u'!RE:\\.z.*',u'!!./.zcompdump' ]
+        patterns = [ u'*', u'!./local', u'!./local/**/*', u'!RE:\\.z.*', u'!!./.zcompdump' ]
         globster = ExceptionGlobster(patterns)
         self.assertEqual(u'*', globster.match('tmp/foo.txt'))
         self.assertEqual(None, globster.match('local'))

=== modified file 'breezy/tests/test_graph.py'
--- breezy/tests/test_graph.py	2017-06-05 20:48:31 +0000
+++ breezy/tests/test_graph.py	2017-11-12 14:04:35 +0000
@@ -232,11 +232,11 @@
 #     | | |
 #     |/|/
 #     t u
-complex_shortcut2 = {'a':[NULL_REVISION], 'b':['a'], 'c':['b'], 'd':['c'],
-                    'e':['d'], 'f':['e'], 'g':['f'], 'h':['d'], 'i':['g'],
-                    'j':['h'], 'k':['h', 'i'], 'l':['k'], 'm':['l'], 'n':['m'],
-                    'o':['n'], 'p':['o'], 'q':['p'], 'r':['q'], 's':['r'],
-                    't':['i', 's'], 'u':['s', 'j'],
+complex_shortcut2 = {'a': [NULL_REVISION], 'b': ['a'], 'c': ['b'], 'd': ['c'],
+                    'e': ['d'], 'f': ['e'], 'g': ['f'], 'h': ['d'], 'i': ['g'],
+                    'j': ['h'], 'k': ['h', 'i'], 'l': ['k'], 'm': ['l'], 'n': ['m'],
+                    'o': ['n'], 'p': ['o'], 'q': ['p'], 'r': ['q'], 's': ['r'],
+                    't': ['i', 's'], 'u': ['s', 'j'],
                     }
 
 # Graph where different walkers will race to find the common and uncommon
@@ -894,9 +894,9 @@
     def test_heads_limits_search(self):
         # test that a heads query does not search all of history
         graph_dict = {
-            'left':['common'],
-            'right':['common'],
-            'common':['deeper'],
+            'left': ['common'],
+            'right': ['common'],
+            'common': ['deeper'],
         }
         self.assertEqual({'left', 'right'},
             self._run_heads_break_deeper(graph_dict, ['left', 'right']))
@@ -904,11 +904,11 @@
     def test_heads_limits_search_assymetric(self):
         # test that a heads query does not search all of history
         graph_dict = {
-            'left':['midleft'],
-            'midleft':['common'],
-            'right':['common'],
-            'common':['aftercommon'],
-            'aftercommon':['deeper'],
+            'left': ['midleft'],
+            'midleft': ['common'],
+            'right': ['common'],
+            'common': ['aftercommon'],
+            'aftercommon': ['deeper'],
         }
         self.assertEqual({'left', 'right'},
             self._run_heads_break_deeper(graph_dict, ['left', 'right']))
@@ -917,11 +917,11 @@
         # test that common nodes are still queried, preventing
         # all-the-way-to-origin behaviour in the following graph:
         graph_dict = {
-            'h1':['shortcut', 'common1'],
-            'h2':['common1'],
-            'shortcut':['common2'],
-            'common1':['common2'],
-            'common2':['deeper'],
+            'h1': ['shortcut', 'common1'],
+            'h2': ['common1'],
+            'shortcut': ['common2'],
+            'common1': ['common2'],
+            'common2': ['deeper'],
         }
         self.assertEqual({'h1', 'h2'},
             self._run_heads_break_deeper(graph_dict, ['h1', 'h2']))
@@ -939,9 +939,9 @@
 
     def test_breadth_first_search_deep_ghosts(self):
         graph = self.make_graph({
-            'head':['present'],
-            'present':['child', 'ghost'],
-            'child':[],
+            'head': ['present'],
+            'present': ['child', 'ghost'],
+            'child': [],
             })
         # with_ghosts reports the ghosts
         search = graph._make_breadth_first_searcher(['head'])
@@ -962,9 +962,9 @@
         # To make the API robust, we allow calling both next() and
         # next_with_ghosts() on the same searcher.
         graph = self.make_graph({
-            'head':['present'],
-            'present':['child', 'ghost'],
-            'child':[],
+            'head': ['present'],
+            'present': ['child', 'ghost'],
+            'child': [],
             })
         # start with next_with_ghosts
         search = graph._make_breadth_first_searcher(['head'])
@@ -984,10 +984,10 @@
     def test_breadth_first_change_search(self):
         # Changing the search should work with both next and next_with_ghosts.
         graph = self.make_graph({
-            'head':['present'],
-            'present':['stopped'],
-            'other':['other_2'],
-            'other_2':[],
+            'head': ['present'],
+            'present': ['stopped'],
+            'other': ['other_2'],
+            'other_2': [],
             })
         search = graph._make_breadth_first_searcher(['head'])
         self.assertEqual(({'head'}, set()), search.next_with_ghosts())
@@ -1035,9 +1035,9 @@
 
     def test_breadth_first_get_result_excludes_current_pending(self):
         graph = self.make_graph({
-            'head':['child'],
-            'child':[NULL_REVISION],
-            NULL_REVISION:[],
+            'head': ['child'],
+            'child': [NULL_REVISION],
+            NULL_REVISION: [],
             })
         search = graph._make_breadth_first_searcher(['head'])
         # At the start, nothing has been seen, to its all excluded:
@@ -1102,9 +1102,9 @@
         # A client should be able to say 'stop node X' even if X has not been
         # returned to the client.
         graph = self.make_graph({
-            'head':['child', 'ghost1'],
-            'child':[NULL_REVISION],
-            NULL_REVISION:[],
+            'head': ['child', 'ghost1'],
+            'child': [NULL_REVISION],
+            NULL_REVISION: [],
             })
         search = graph._make_breadth_first_searcher(['head'])
         expected = [
@@ -1128,10 +1128,10 @@
         # from the result even if X was seen in an older iteration of the
         # search.
         graph = self.make_graph({
-            'head':['middle'],
-            'middle':['child'],
-            'child':[NULL_REVISION],
-            NULL_REVISION:[],
+            'head': ['middle'],
+            'middle': ['child'],
+            'child': [NULL_REVISION],
+            NULL_REVISION: [],
             })
         search = graph._make_breadth_first_searcher(['head'])
         expected = [
@@ -1152,9 +1152,9 @@
 
     def test_breadth_first_get_result_ghosts_are_excluded(self):
         graph = self.make_graph({
-            'head':['child', 'ghost'],
-            'child':[NULL_REVISION],
-            NULL_REVISION:[],
+            'head': ['child', 'ghost'],
+            'child': [NULL_REVISION],
+            NULL_REVISION: [],
             })
         search = graph._make_breadth_first_searcher(['head'])
         # using next:
@@ -1173,9 +1173,9 @@
 
     def test_breadth_first_get_result_starting_a_ghost_ghost_is_excluded(self):
         graph = self.make_graph({
-            'head':['child'],
-            'child':[NULL_REVISION],
-            NULL_REVISION:[],
+            'head': ['child'],
+            'child': [NULL_REVISION],
+            NULL_REVISION: [],
             })
         search = graph._make_breadth_first_searcher(['head'])
         # using next:
@@ -1194,8 +1194,8 @@
 
     def test_breadth_first_revision_count_includes_NULL_REVISION(self):
         graph = self.make_graph({
-            'head':[NULL_REVISION],
-            NULL_REVISION:[],
+            'head': [NULL_REVISION],
+            NULL_REVISION: [],
             })
         search = graph._make_breadth_first_searcher(['head'])
         # using next:
@@ -1215,8 +1215,8 @@
     def test_breadth_first_search_get_result_after_StopIteration(self):
         # StopIteration should not invalid anything..
         graph = self.make_graph({
-            'head':[NULL_REVISION],
-            NULL_REVISION:[],
+            'head': [NULL_REVISION],
+            NULL_REVISION: [],
             })
         search = graph._make_breadth_first_searcher(['head'])
         # using next:

=== modified file 'breezy/tests/test_help.py'
--- breezy/tests/test_help.py	2017-10-27 00:18:42 +0000
+++ breezy/tests/test_help.py	2017-11-12 14:04:35 +0000
@@ -400,7 +400,7 @@
         cmd = cmd_WithSeeAlso()
         helptext = cmd.get_help_text(['gam'])
         self.assertEndsWith(
-            helptext,'''\
+            helptext, '''\
   -q, --quiet    zz{{Only display errors and warnings.}}
   -v, --verbose  zz{{Display more information.}}
   -h, --help     zz{{Show help message.}}

=== modified file 'breezy/tests/test_http.py'
--- breezy/tests/test_http.py	2017-10-26 11:10:38 +0000
+++ breezy/tests/test_http.py	2017-11-12 14:04:35 +0000
@@ -286,7 +286,7 @@
                           self.req_handler._parse_ranges(header, file_size))
 
     def test_simple_range(self):
-        self.assertRanges([(0,2)], 'bytes=0-2', 12)
+        self.assertRanges([(0, 2)], 'bytes=0-2', 12)
 
     def test_tail(self):
         self.assertRanges([(8, 11)], 'bytes=-4', 12)
@@ -513,8 +513,8 @@
         self.assertEqual(value, range_header(coalesced, tail))
 
     def test_range_header_single(self):
-        self.check_header('0-9', ranges=[(0,9)])
-        self.check_header('100-109', ranges=[(100,109)])
+        self.check_header('0-9', ranges=[(0, 9)])
+        self.check_header('100-109', ranges=[(100, 109)])
 
     def test_range_header_tail(self):
         self.check_header('-10', tail=10)
@@ -522,11 +522,11 @@
 
     def test_range_header_multi(self):
         self.check_header('0-9,100-200,300-5000',
-                          ranges=[(0,9), (100, 200), (300,5000)])
+                          ranges=[(0, 9), (100, 200), (300, 5000)])
 
     def test_range_header_mixed(self):
         self.check_header('0-9,300-5000,-50',
-                          ranges=[(0,9), (300,5000)],
+                          ranges=[(0, 9), (300, 5000)],
                           tail=50)
 
 
@@ -759,12 +759,12 @@
         # This is intentionally reading off the end of the file
         # since we are sure that it cannot get there
         self.assertListRaises((errors.InvalidRange, errors.ShortReadvError,),
-                              t.readv, 'a', [(1,1), (8,10)])
+                              t.readv, 'a', [(1, 1), (8, 10)])
 
         # This is trying to seek past the end of the file, it should
         # also raise a special error
         self.assertListRaises((errors.InvalidRange, errors.ShortReadvError,),
-                              t.readv, 'a', [(12,2)])
+                              t.readv, 'a', [(12, 2)])
 
     def test_readv_multiple_get_requests(self):
         server = self.get_readonly_server()
@@ -885,7 +885,7 @@
         self.send_header('Accept-Ranges', 'bytes')
         # XXX: this is strange; the 'random' name below seems undefined and
         # yet the tests pass -- mbp 2010-10-11 bug 658773
-        boundary = "%d" % random.randint(0,0x7FFFFFFF)
+        boundary = "%d" % random.randint(0, 0x7FFFFFFF)
         self.send_header("Content-Type",
                          "multipart/byteranges; boundary=%s" % boundary)
         self.end_headers()
@@ -1271,7 +1271,7 @@
         coalesce = t._coalesce_offsets
         coalesced = list(coalesce(offsets, limit=0, fudge_factor=0))
         code, data = t._get(relpath, coalesced)
-        self.assertTrue(code in (200, 206),'_get returns: %d' % code)
+        self.assertTrue(code in (200, 206), '_get returns: %d' % code)
         for start, end in ranges:
             data.seek(start)
             yield data.read(end - start + 1)
@@ -1279,14 +1279,14 @@
     def _file_tail(self, relpath, tail_amount):
         t = self.get_readonly_transport()
         code, data = t._get(relpath, [], tail_amount)
-        self.assertTrue(code in (200, 206),'_get returns: %d' % code)
+        self.assertTrue(code in (200, 206), '_get returns: %d' % code)
         data.seek(-tail_amount, 2)
         return data.read(tail_amount)
 
     def test_range_header(self):
         # Valid ranges
         self.assertEqual(
-            ['0', '234'], list(self._file_contents('a', [(0,0), (2,4)])))
+            ['0', '234'], list(self._file_contents('a', [(0, 0), (2, 4)])))
 
     def test_range_header_tail(self):
         self.assertEqual('789', self._file_tail('a', 3))
@@ -1380,7 +1380,7 @@
         super(TestHTTPSilentRedirections, self).setUp()
         install_redirected_request(self)
         cleanup_http_redirection_connections(self)
-        self.build_tree_contents([('a','a'),
+        self.build_tree_contents([('a', 'a'),
                                   ('1/',),
                                   ('1/a', 'redirected once'),
                                   ('2/',),
@@ -1579,7 +1579,7 @@
         t = self.get_user_transport(None, None)
         ui.ui_factory = tests.TestUIFactory(stdin='joe\nfoo\n')
         stdout, stderr = ui.ui_factory.stdout, ui.ui_factory.stderr
-        self.assertEqual('contents of a\n',t.get('a').read())
+        self.assertEqual('contents of a\n', t.get('a').read())
         # stdin should be empty
         self.assertEqual('', ui.ui_factory.stdin.readline())
         stderr.seek(0)
@@ -1602,10 +1602,10 @@
         self.assertEqual('', stdout.getvalue())
         # And we shouldn't prompt again for a different request
         # against the same transport.
-        self.assertEqual('contents of b\n',t.get('b').read())
+        self.assertEqual('contents of b\n', t.get('b').read())
         t2 = t.clone()
         # And neither against a clone
-        self.assertEqual('contents of b\n',t2.get('b').read())
+        self.assertEqual('contents of b\n', t2.get('b').read())
         # Only one 'Authentication Required' error should occur
         self.assertEqual(1, self.server.auth_required_errors)
 
@@ -1634,7 +1634,7 @@
         _setup_authentication_config(scheme='http', port=self.server.port,
                                      user=user, password=password)
         # Issue a request to the server to connect
-        self.assertEqual('contents of a\n',t.get('a').read())
+        self.assertEqual('contents of a\n', t.get('a').read())
         # stdin should have  been left untouched
         self.assertEqual(stdin_content, ui.ui_factory.stdin.readline())
         # Only one 'Authentication Required' error should occur
@@ -1792,7 +1792,7 @@
         remote_transport = remote.RemoteTransport('bzr://fake_host/',
                                                   medium=medium)
         self.assertEqual(
-            [(0, "c")], list(remote_transport.readv("data-file", [(0,1)])))
+            [(0, "c")], list(remote_transport.readv("data-file", [(0, 1)])))
 
     def test_http_send_smart_request(self):
 
@@ -2163,7 +2163,7 @@
 
     def setUp(self):
         super(TestAuthOnRedirected, self).setUp()
-        self.build_tree_contents([('a','a'),
+        self.build_tree_contents([('a', 'a'),
                                   ('1/',),
                                   ('1/a', 'redirected once'),
                                   ],)

=== modified file 'breezy/tests/test_https_ca_bundle.py'
--- breezy/tests/test_https_ca_bundle.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_https_ca_bundle.py	2017-11-12 14:04:35 +0000
@@ -35,7 +35,7 @@
 
     def _make_file(self, in_dir='.'):
         fname = os.path.join(in_dir, 'curl-ca-bundle.crt')
-        f = file(fname,'w')
+        f = file(fname, 'w')
         f.write('spam')
         f.close()
 

=== modified file 'breezy/tests/test_index.py'
--- breezy/tests/test_index.py	2017-07-30 23:53:38 +0000
+++ breezy/tests/test_index.py	2017-11-12 14:04:35 +0000
@@ -823,7 +823,7 @@
         index = self.make_index(1, nodes=[
             (('name', ), 'data', ([('ref', ), ('ref', )], )),
             (('ref', ), 'refdata', ([], ))])
-        self.assertEqual({(index, ('name', ), 'data', ((('ref',),('ref',)),)),
+        self.assertEqual({(index, ('name', ), 'data', ((('ref',), ('ref',)),)),
             (index, ('ref', ), 'refdata', ((), ))},
             set(index.iter_entries([('name',), ('ref',)])))
 

=== modified file 'breezy/tests/test_knit.py'
--- breezy/tests/test_knit.py	2017-07-30 18:50:21 +0000
+++ breezy/tests/test_knit.py	2017-11-12 14:04:35 +0000
@@ -1212,9 +1212,9 @@
         index = self.get_knit_index(transport, "filename", "r")
 
         self.assertEqual({
-            ("a",):(),
-            ("b",):(("a",), ("c",)),
-            ("c",):(("b",), ("a",), ("e",)),
+            ("a",): (),
+            ("b",): (("a",), ("c",)),
+            ("c",): (("b",), ("a",), ("e",)),
             }, index.get_parent_map(index.keys()))
 
     def test_impossible_parent(self):
@@ -1421,7 +1421,7 @@
         details = ('line-delta', False)
         p1_record = ['line1\n', 'line2\n']
         ann._num_compression_children[p1_key] = 1
-        res = ann._expand_record(rev_key, (p1_key,p2_key), p1_key,
+        res = ann._expand_record(rev_key, (p1_key, p2_key), p1_key,
                                  record, details)
         self.assertEqual(None, res)
         # self.assertTrue(p1_key in ann._pending_deltas)
@@ -1543,9 +1543,9 @@
             ('a-2',): ((('a-2',), 0, 0), None, (('a-1',),), ('fulltext', False)),
             ('a-3',): ((('a-3',), 0, 0), None, (('a-2',),), ('fulltext', False)),
             }, idx.get_build_details(idx.keys()))
-        self.assertEqual({('a-1',):(),
-            ('a-2',):(('a-1',),),
-            ('a-3',):(('a-2',),),},
+        self.assertEqual({('a-1',): (),
+            ('a-2',): (('a-1',),),
+            ('a-3',): (('a-2',),),},
             idx.get_parent_map(idx.keys()))
 
     def test_add_versions_fails_clean(self):

=== modified file 'breezy/tests/test_lazy_import.py'
--- breezy/tests/test_lazy_import.py	2017-08-26 15:35:30 +0000
+++ breezy/tests/test_lazy_import.py	2017-11-12 14:04:35 +0000
@@ -293,8 +293,8 @@
         val = test_func1(1, 2, c='3')
         self.assertIs(test_func1, func)
 
-        self.assertEqual((1,2,'3'), val)
-        self.assertEqual([('__call__', (1,2), {'c':'3'}),
+        self.assertEqual((1, 2, '3'), val)
+        self.assertEqual([('__call__', (1, 2), {'c':'3'}),
                           'factory',
                           'func',
                          ], actions)
@@ -715,8 +715,8 @@
 
         InstrumentedImportReplacer(scope=globals(),
             name='root5', module_path=[self.root_name], member=None,
-            children={'mod5':([self.root_name, self.mod_name], None, {}),
-                      'sub5':([self.root_name, self.sub_name], None,
+            children={'mod5': ([self.root_name, self.mod_name], None, {}),
+                      'sub5': ([self.root_name, self.sub_name], None,
                             {'submoda5':([self.root_name, self.sub_name,
                                          self.submoda_name], None, {}),
                              'submodb5':([self.root_name, self.sub_name,
@@ -784,12 +784,12 @@
                                         proc.imports))
 
     def test_import_one(self):
-        self.check({'one':(['one'], None, {}),
+        self.check({'one': (['one'], None, {}),
                    }, ['import one'])
 
     def test_import_one_two(self):
-        one_two_map = {'one':(['one'], None,
-                              {'two':(['one', 'two'], None, {}),
+        one_two_map = {'one': (['one'], None,
+                              {'two': (['one', 'two'], None, {}),
                               }),
                       }
         self.check(one_two_map, ['import one.two'])
@@ -799,9 +799,9 @@
 
     def test_import_one_two_three(self):
         one_two_three_map = {
-            'one':(['one'], None,
-                   {'two':(['one', 'two'], None,
-                           {'three':(['one', 'two', 'three'], None, {}),
+            'one': (['one'], None,
+                   {'two': (['one', 'two'], None,
+                           {'three': (['one', 'two', 'three'], None, {}),
                            }),
                    }),
         }
@@ -813,17 +813,17 @@
                                               'import one'])
 
     def test_import_one_as_x(self):
-        self.check({'x':(['one'], None, {}),
+        self.check({'x': (['one'], None, {}),
                           }, ['import one as x'])
 
     def test_import_one_two_as_x(self):
-        self.check({'x':(['one', 'two'], None, {}),
+        self.check({'x': (['one', 'two'], None, {}),
                    }, ['import one.two as x'])
 
     def test_import_mixed(self):
-        mixed = {'x':(['one', 'two'], None, {}),
-                 'one':(['one'], None,
-                       {'two':(['one', 'two'], None, {}),
+        mixed = {'x': (['one', 'two'], None, {}),
+                 'one': (['one'], None,
+                       {'two': (['one', 'two'], None, {}),
                        }),
                 }
         self.check(mixed, ['import one.two as x, one.two'])
@@ -854,8 +854,8 @@
                           ['from one import two as three'])
 
     def test_from_one_import_two_three(self):
-        two_three_map = {'two':(['one'], 'two', {}),
-                         'three':(['one'], 'three', {}),
+        two_three_map = {'two': (['one'], 'two', {}),
+                         'three': (['one'], 'three', {}),
                         }
         self.check_result(two_three_map,
                           ['from one import two, three'])
@@ -938,8 +938,8 @@
         self.check(exp, '\nimport one\n')
 
     def test_import_one_two(self):
-        exp = {'one':(['one'], None,
-                      {'two':(['one', 'two'], None, {}),
+        exp = {'one': (['one'], None,
+                      {'two': (['one', 'two'], None, {}),
                       }),
               }
         self.check(exp, 'import one.two')
@@ -951,13 +951,13 @@
         self.check(exp, 'import one as two')
 
     def test_import_many(self):
-        exp = {'one':(['one'], None,
-                      {'two':(['one', 'two'], None,
-                              {'three':(['one', 'two', 'three'], None, {}),
+        exp = {'one': (['one'], None,
+                      {'two': (['one', 'two'], None,
+                              {'three': (['one', 'two', 'three'], None, {}),
                               }),
-                       'four':(['one', 'four'], None, {}),
+                       'four': (['one', 'four'], None, {}),
                       }),
-               'five':(['one', 'five'], None, {}),
+               'five': (['one', 'five'], None, {}),
               }
         self.check(exp, 'import one.two.three, one.four, one.five as five')
         self.check(exp, 'import one.five as five\n'
@@ -983,9 +983,9 @@
                         '    )\n')
 
     def test_from_many(self):
-        exp = {'two':(['one'], 'two', {}),
-               'three':(['one', 'two'], 'three', {}),
-               'five':(['one', 'two'], 'four', {}),
+        exp = {'two': (['one'], 'two', {}),
+               'three': (['one', 'two'], 'three', {}),
+               'five': (['one', 'two'], 'four', {}),
               }
         self.check(exp, 'from one import two\n'
                         'from one.two import three, four as five\n')
@@ -996,11 +996,11 @@
                         '    )\n')
 
     def test_mixed(self):
-        exp = {'two':(['one'], 'two', {}),
-               'three':(['one', 'two'], 'three', {}),
-               'five':(['one', 'two'], 'four', {}),
-               'one':(['one'], None,
-                      {'two':(['one', 'two'], None, {}),
+        exp = {'two': (['one'], 'two', {}),
+               'three': (['one', 'two'], 'three', {}),
+               'five': (['one', 'two'], 'four', {}),
+               'one': (['one'], None,
+                      {'two': (['one', 'two'], None, {}),
                       }),
               }
         self.check(exp, 'from one import two\n'

=== modified file 'breezy/tests/test_log.py'
--- breezy/tests/test_log.py	2017-08-27 20:37:36 +0000
+++ breezy/tests/test_log.py	2017-11-12 14:04:35 +0000
@@ -410,7 +410,7 @@
     def test_show_ids(self):
         wt = self.make_branch_and_tree('parent')
         self.build_tree(['parent/f1', 'parent/f2'])
-        wt.add(['f1','f2'])
+        wt.add(['f1', 'f2'])
         self.wt_commit(wt, 'first post', rev_id='a')
         child_wt = wt.controldir.sprout('child').open_workingtree()
         self.wt_commit(child_wt, 'branch 1 changes', rev_id='b')
@@ -431,7 +431,7 @@
 
 """,
             wt.branch, log.ShortLogFormatter,
-            formatter_kwargs=dict(levels=0,show_ids=True))
+            formatter_kwargs=dict(levels=0, show_ids=True))
 
 
 class TestShortLogFormatterWithMergeRevisions(TestCaseForLogFormatter):
@@ -546,7 +546,7 @@
     def test_verbose_merge_revisions_contain_deltas(self):
         wt = self.make_branch_and_tree('parent')
         self.build_tree(['parent/f1', 'parent/f2'])
-        wt.add(['f1','f2'])
+        wt.add(['f1', 'f2'])
         self.wt_commit(wt, 'first post')
         child_wt = wt.controldir.sprout('child').open_workingtree()
         os.unlink('child/f1')
@@ -724,7 +724,7 @@
     def test_show_ids(self):
         wt = self.make_branch_and_tree('parent')
         self.build_tree(['parent/f1', 'parent/f2'])
-        wt.add(['f1','f2'])
+        wt.add(['f1', 'f2'])
         self.wt_commit(wt, 'first post', rev_id='a')
         child_wt = wt.controldir.sprout('child').open_workingtree()
         self.wt_commit(child_wt, 'branch 1 changes', rev_id='b')
@@ -760,7 +760,7 @@
   first post
 """,
             wt.branch, log.LongLogFormatter,
-            formatter_kwargs=dict(levels=0,show_ids=True))
+            formatter_kwargs=dict(levels=0, show_ids=True))
 
 
 class TestLongLogFormatterWithoutMergeRevisions(TestCaseForLogFormatter):
@@ -789,7 +789,7 @@
     def test_long_verbose_contain_deltas(self):
         wt = self.make_branch_and_tree('parent')
         self.build_tree(['parent/f1', 'parent/f2'])
-        wt.add(['f1','f2'])
+        wt.add(['f1', 'f2'])
         self.wt_commit(wt, 'first post')
         child_wt = wt.controldir.sprout('child').open_workingtree()
         os.unlink('child/f1')

=== modified file 'breezy/tests/test_merge3.py'
--- breezy/tests/test_merge3.py	2017-09-26 00:55:04 +0000
+++ breezy/tests/test_merge3.py	2017-11-12 14:04:35 +0000
@@ -110,7 +110,7 @@
                           [(0, 2,
                             0, 2,
                             0, 2),
-                           (2,2, 2,2, 2,2)])
+                           (2, 2, 2, 2, 2, 2)])
 
         self.assertEqual(list(m3.merge_regions()),
                           [('unchanged', 0, 2)])
@@ -126,8 +126,8 @@
         # todo: should use a sentinal at end as from get_matching_blocks
         # to match without zz
         self.assertEqual(list(m3.find_sync_regions()),
-                          [(0,1, 2,3, 0,1),
-                           (1,1, 3,3, 1,1),])
+                          [(0, 1, 2, 3, 0, 1),
+                           (1, 1, 3, 3, 1, 1),])
 
         self.assertEqual(list(m3.merge_regions()),
                           [('a', 0, 2),
@@ -144,7 +144,7 @@
         # todo: should use a sentinal at end as from get_matching_blocks
         # to match without zz
         self.assertEqual(list(m3.find_sync_regions()),
-                          [(0,0, 2,2, 0,0)])
+                          [(0, 0, 2, 2, 0, 0)])
 
         self.assertEqual(list(m3.merge_regions()),
                           [('a', 0, 2)])
@@ -162,9 +162,9 @@
                           [(0, 1), (1, 2)])
 
         self.assertEqual(list(m3.find_sync_regions()),
-                          [(0,1, 0,1, 0,1),
-                           (1,2, 2,3, 1,2),
-                           (2,2, 3,3, 2,2),])
+                          [(0, 1, 0, 1, 0, 1),
+                           (1, 2, 2, 3, 1, 2),
+                           (2, 2, 3, 3, 2, 2),])
 
         self.assertEqual(list(m3.merge_regions()),
                           [('unchanged', 0, 1),
@@ -239,14 +239,14 @@
                           [(0, 1), (1, 2)])
 
         self.assertEqual(list(m3.find_sync_regions()),
-                          [(0,1, 0,1, 0,1),
-                           (1,2, 2,3, 2,3),
-                           (2,2, 3,3, 3,3),])
+                          [(0, 1, 0, 1, 0, 1),
+                           (1, 2, 2, 3, 2, 3),
+                           (2, 2, 3, 3, 3, 3),])
 
         self.assertEqual(list(m3.merge_regions()),
-                          [('unchanged', 0,1),
-                           ('conflict', 1,1, 1,2, 1,2),
-                           ('unchanged', 1,2)])
+                          [('unchanged', 0, 1),
+                           ('conflict', 1, 1, 1, 2, 1, 2),
+                           ('unchanged', 1, 2)])
 
         self.assertEqual(list(m3.merge_groups()),
                           [('unchanged', ['aaa\n']),
@@ -279,9 +279,9 @@
                           [(0, 1), (2, 3)])
 
         self.assertEqual(list(m3.find_sync_regions()),
-                          [(0,1, 0,1, 0,1),
-                           (2,3, 2,3, 2,3),
-                           (3,3, 3,3, 3,3),])
+                          [(0, 1, 0, 1, 0, 1),
+                           (2, 3, 2, 3, 2, 3),
+                           (3, 3, 3, 3, 3, 3),])
 
     def test_replace_multi(self):
         """Replacement with regions of different size."""
@@ -294,9 +294,9 @@
 
 
         self.assertEqual(list(m3.find_sync_regions()),
-                          [(0,1, 0,1, 0,1),
-                           (3,4, 4,5, 5,6),
-                           (4,4, 5,5, 6,6),])
+                          [(0, 1, 0, 1, 0, 1),
+                           (3, 4, 4, 5, 5, 6),
+                           (4, 4, 5, 5, 6, 6),])
 
     def test_merge_poem(self):
         """Test case from diff3 manual"""
@@ -439,9 +439,9 @@
         merge_groups and merge_regions work with non-str input.  Methods that
         return lines like merge_lines fail.
         """
-        base = [(x,x) for x in 'abcde']
-        a = [(x,x) for x in 'abcdef']
-        b = [(x,x) for x in 'Zabcde']
+        base = [(x, x) for x in 'abcde']
+        a = [(x, x) for x in 'abcdef']
+        b = [(x, x) for x in 'Zabcde']
         m3 = merge3.Merge3(base, a, b, allow_objects=True)
         self.assertEqual(
             [('b', 0, 1),
@@ -450,7 +450,7 @@
             list(m3.merge_regions()))
         self.assertEqual(
             [('b', [('Z', 'Z')]),
-             ('unchanged', [(x,x) for x in 'abcde']),
+             ('unchanged', [(x, x) for x in 'abcde']),
              ('a', [('f', 'f')])],
             list(m3.merge_groups()))
 

=== modified file 'breezy/tests/test_merge_core.py'
--- breezy/tests/test_merge_core.py	2017-06-24 16:32:30 +0000
+++ breezy/tests/test_merge_core.py	2017-11-12 14:04:35 +0000
@@ -607,24 +607,24 @@
 
     def test_merge_swapping_renames(self):
         a_wt = self.make_branch_and_tree('a')
-        with file('a/un','wb') as f: f.write('UN')
-        with file('a/deux','wb') as f: f.write('DEUX')
+        with file('a/un', 'wb') as f: f.write('UN')
+        with file('a/deux', 'wb') as f: f.write('DEUX')
         a_wt.add('un', 'un-id')
         a_wt.add('deux', 'deux-id')
         a_wt.commit('r0', rev_id='r0')
         self.run_bzr('branch a b')
         b_wt = WorkingTree.open('b')
-        b_wt.rename_one('un','tmp')
-        b_wt.rename_one('deux','un')
-        b_wt.rename_one('tmp','deux')
+        b_wt.rename_one('un', 'tmp')
+        b_wt.rename_one('deux', 'un')
+        b_wt.rename_one('tmp', 'deux')
         b_wt.commit('r1', rev_id='r1')
         self.assertEqual(0, a_wt.merge_from_branch(b_wt.branch,
             b_wt.branch.last_revision(), b_wt.branch.get_rev_id(1)))
         self.assertPathExists('a/un')
         self.assertTrue('a/deux')
         self.assertFalse(os.path.exists('a/tmp'))
-        self.assertEqual(file('a/un').read(),'DEUX')
-        self.assertEqual(file('a/deux').read(),'UN')
+        self.assertEqual(file('a/un').read(), 'DEUX')
+        self.assertEqual(file('a/deux').read(), 'UN')
 
     def test_merge_delete_and_add_same(self):
         a_wt = self.make_branch_and_tree('a')
@@ -641,7 +641,7 @@
         a_wt.merge_from_branch(b_wt.branch, b_wt.branch.last_revision(),
                                b_wt.branch.get_rev_id(1))
         self.assertTrue(os.path.exists('a/file'))
-        self.assertEqual(file('a/file').read(),'THAT')
+        self.assertEqual(file('a/file').read(), 'THAT')
 
     def test_merge_rename_before_create(self):
         """rename before create

=== modified file 'breezy/tests/test_missing.py'
--- breezy/tests/test_missing.py	2017-06-24 16:32:30 +0000
+++ breezy/tests/test_missing.py	2017-11-12 14:04:35 +0000
@@ -95,7 +95,7 @@
                             verbose=True))
         self.assertEqual(4, len(results))
 
-        r0,r1,r2,r3 = results
+        r0, r1, r2, r3 = results
 
         self.assertEqual([('2', 'c-2'), ('3', 'c-3'),
                           ('4', 'c-4'), ('5', 'c-5'),],

=== modified file 'breezy/tests/test_msgeditor.py'
--- breezy/tests/test_msgeditor.py	2017-07-23 18:56:16 +0000
+++ breezy/tests/test_msgeditor.py	2017-11-12 14:04:35 +0000
@@ -295,7 +295,7 @@
         # check that commit template written properly
         # and has platform native line-endings (CRLF on win32)
         create_file = msgeditor._create_temp_file_with_commit_template
-        msgfilename, hasinfo = create_file('infotext','----','start message')
+        msgfilename, hasinfo = create_file('infotext', '----', 'start message')
         self.assertNotEqual(None, msgfilename)
         self.assertTrue(hasinfo)
         expected = os.linesep.join(['start message',

=== modified file 'breezy/tests/test_options.py'
--- breezy/tests/test_options.py	2017-07-14 21:15:49 +0000
+++ breezy/tests/test_options.py	2017-11-12 14:04:35 +0000
@@ -167,7 +167,7 @@
 
     def test_lazy_registry(self):
         options = [option.RegistryOption('format', '',
-                   lazy_registry=('breezy.controldir','format_registry'),
+                   lazy_registry=('breezy.controldir', 'format_registry'),
                    converter=str)]
         opts, args = self.parse(options, ['--format', 'knit'])
         self.assertEqual({'format': 'knit'}, opts)
@@ -239,14 +239,14 @@
         "Test booleans get True and False passed correctly to a callback."""
         cb_calls = []
         def cb(option, name, value, parser):
-            cb_calls.append((option,name,value,parser))
+            cb_calls.append((option, name, value, parser))
         options = [option.Option('hello', custom_callback=cb)]
         opts, args = self.parse(options, ['--hello', '--no-hello'])
         self.assertEqual(2, len(cb_calls))
-        opt,name,value,parser = cb_calls[0]
+        opt, name, value, parser = cb_calls[0]
         self.assertEqual('hello', name)
         self.assertTrue(value)
-        opt,name,value,parser = cb_calls[1]
+        opt, name, value, parser = cb_calls[1]
         self.assertEqual('hello', name)
         self.assertFalse(value)
 
@@ -254,15 +254,15 @@
         """Test callbacks work for string options both long and short."""
         cb_calls = []
         def cb(option, name, value, parser):
-            cb_calls.append((option,name,value,parser))
+            cb_calls.append((option, name, value, parser))
         options = [option.Option('hello', type=str, custom_callback=cb,
             short_name='h')]
         opts, args = self.parse(options, ['--hello', 'world', '-h', 'mars'])
         self.assertEqual(2, len(cb_calls))
-        opt,name,value,parser = cb_calls[0]
+        opt, name, value, parser = cb_calls[0]
         self.assertEqual('hello', name)
         self.assertEqual('world', value)
-        opt,name,value,parser = cb_calls[1]
+        opt, name, value, parser = cb_calls[1]
         self.assertEqual('hello', name)
         self.assertEqual('mars', value)
 
@@ -313,18 +313,18 @@
         cb_calls = []
         def cb(option, name, value, parser):
             # Note that the value is a reference so copy to keep it
-            cb_calls.append((option,name,value[:],parser))
+            cb_calls.append((option, name, value[:], parser))
         options = [option.ListOption('hello', type=str, custom_callback=cb)]
         opts, args = self.parse(options, ['--hello=world', '--hello=mars',
             '--hello=-'])
         self.assertEqual(3, len(cb_calls))
-        opt,name,value,parser = cb_calls[0]
+        opt, name, value, parser = cb_calls[0]
         self.assertEqual('hello', name)
         self.assertEqual(['world'], value)
-        opt,name,value,parser = cb_calls[1]
+        opt, name, value, parser = cb_calls[1]
         self.assertEqual('hello', name)
         self.assertEqual(['world', 'mars'], value)
-        opt,name,value,parser = cb_calls[2]
+        opt, name, value, parser = cb_calls[2]
         self.assertEqual('hello', name)
         self.assertEqual([], value)
 

=== modified file 'breezy/tests/test_osutils.py'
--- breezy/tests/test_osutils.py	2017-10-27 00:18:42 +0000
+++ breezy/tests/test_osutils.py	2017-11-12 14:04:35 +0000
@@ -1668,9 +1668,9 @@
             processed_files.append(('d', from_path, to_path))
         def link_handler(from_path, to_path):
             processed_links.append((from_path, to_path))
-        handlers = {'file':file_handler,
-                    'directory':dir_handler,
-                    'symlink':link_handler,
+        handlers = {'file': file_handler,
+                    'directory': dir_handler,
+                    'symlink': link_handler,
                    }
 
         self.build_tree(['source/', 'source/a', 'source/b/', 'source/b/c'])

=== modified file 'breezy/tests/test_pack.py'
--- breezy/tests/test_pack.py	2017-11-11 19:14:13 +0000
+++ breezy/tests/test_pack.py	2017-11-12 14:04:35 +0000
@@ -565,7 +565,7 @@
         """Test reading of both single bytes and all bytes in a hunk."""
         transport = self.get_transport()
         transport.put_bytes(b'sample', b'0123456789')
-        f = pack.ReadVFile(transport.readv(b'sample', [(0,1), (1,2), (4,1), (6,2)]))
+        f = pack.ReadVFile(transport.readv(b'sample', [(0, 1), (1, 2), (4, 1), (6, 2)]))
         results = []
         results.append(f.read(1))
         results.append(f.read(2))
@@ -581,7 +581,7 @@
         """
         transport = self.get_transport()
         transport.put_bytes(b'sample', b'0\n2\n4\n')
-        f = pack.ReadVFile(transport.readv(b'sample', [(0,2), (2,4)]))
+        f = pack.ReadVFile(transport.readv(b'sample', [(0, 2), (2, 4)]))
         results = []
         results.append(f.readline())
         results.append(f.readline())
@@ -592,7 +592,7 @@
         """Test exercising one byte reads, readline, and then read again."""
         transport = self.get_transport()
         transport.put_bytes(b'sample', b'0\n2\n4\n')
-        f = pack.ReadVFile(transport.readv(b'sample', [(0,6)]))
+        f = pack.ReadVFile(transport.readv(b'sample', [(0, 6)]))
         results = []
         results.append(f.read(1))
         results.append(f.readline())

=== modified file 'breezy/tests/test_remote.py'
--- breezy/tests/test_remote.py	2017-09-26 00:55:04 +0000
+++ breezy/tests/test_remote.py	2017-11-12 14:04:35 +0000
@@ -2363,7 +2363,7 @@
         result = repo.gather_stats(None)
         self.assertEqual(
             [('call_expecting_body', 'Repository.gather_stats',
-             ('quack/','','no'))],
+             ('quack/', '', 'no'))],
             client._calls)
         self.assertEqual({'revisions': 2, 'size': 18}, result)
 
@@ -2900,7 +2900,7 @@
         # Then it should ask the fallback, using revno/revid from the
         # history-incomplete response as the known revno/revid.
         client.add_expected_call(
-            'Repository.get_rev_id_for_revno',('fallback/', 1, (2, 'rev-two')),
+            'Repository.get_rev_id_for_revno', ('fallback/', 1, (2, 'rev-two')),
             'success', ('ok', 'rev-one'))
         result = repo.get_rev_id_for_revno(1, (42, 'rev-foo'))
         self.assertEqual((True, 'rev-one'), result)
@@ -3972,7 +3972,7 @@
         tip = stacked.last_revision()
         stacked.repository._ensure_real()
         graph = stacked.repository.get_graph()
-        revs = [r for (r,ps) in graph.iter_ancestry([tip])
+        revs = [r for (r, ps) in graph.iter_ancestry([tip])
                 if r != NULL_REVISION]
         revs.reverse()
         search = vf_search.PendingAncestryResult([tip], stacked.repository)

=== modified file 'breezy/tests/test_revision.py'
--- breezy/tests/test_revision.py	2017-07-10 20:12:25 +0000
+++ breezy/tests/test_revision.py	2017-11-12 14:04:35 +0000
@@ -176,7 +176,7 @@
         self.assertEqual([None, '1', '2'], history)
         rev = tree.branch.repository.get_revision('3')
         history = rev.get_history(tree.branch.repository)
-        self.assertEqual([None, '1', '2' ,'3'], history)
+        self.assertEqual([None, '1', '2', '3'], history)
 
 
 class TestReservedId(TestCase):

=== modified file 'breezy/tests/test_sampler.py'
--- breezy/tests/test_sampler.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/test_sampler.py	2017-11-12 14:04:35 +0000
@@ -36,4 +36,4 @@
 class DemoTest(TestCaseInTempDir):
 
     def test_nothing(self):
-        self.assertEqual(1,1)
+        self.assertEqual(1, 1)

=== modified file 'breezy/tests/test_selftest.py'
--- breezy/tests/test_selftest.py	2017-10-27 00:18:42 +0000
+++ breezy/tests/test_selftest.py	2017-11-12 14:04:35 +0000
@@ -139,7 +139,7 @@
         class MockModule(object):
             def get_test_permutations(self):
                 return sample_permutation
-        sample_permutation = [(1,2), (3,4)]
+        sample_permutation = [(1, 2), (3, 4)]
         from .per_transport import get_transport_test_permutations
         self.assertEqual(sample_permutation,
                          get_transport_test_permutations(MockModule()))
@@ -3698,7 +3698,7 @@
             def setUp(self):
                 super(Test, self).setUp()
                 self.hooks = hooks.Hooks()
-                self.hooks.add_hook('myhook', 'Foo bar blah', (2,4))
+                self.hooks.add_hook('myhook', 'Foo bar blah', (2, 4))
                 self.install_counter_hook(self.hooks, 'myhook')
 
             def no_hook(self):

=== modified file 'breezy/tests/test_smart.py'
--- breezy/tests/test_smart.py	2017-08-26 13:58:53 +0000
+++ breezy/tests/test_smart.py	2017-11-12 14:04:35 +0000
@@ -122,7 +122,7 @@
     def test_repeated_substreams_same_kind_are_one_stream(self):
         # Make a stream - an iterable of bytestrings.
         stream = [('text', [versionedfile.FulltextContentFactory(('k1',), None,
-            None, 'foo')]),('text', [
+            None, 'foo')]), ('text', [
             versionedfile.FulltextContentFactory(('k2',), None, None, 'bar')])]
         fmt = controldir.format_registry.get('pack-0.92')().repository_format
         bytes = smart_repo._stream_to_byte_stream(stream, fmt)
@@ -652,7 +652,7 @@
         backing = self.get_transport()
         request = smart_dir.SmartServerRequestOpenBranch(backing)
         branch = self.make_branch('branch')
-        checkout = branch.create_checkout('reference',lightweight=True)
+        checkout = branch.create_checkout('reference', lightweight=True)
         reference_url = _mod_bzrbranch.BranchReferenceFormat().get_reference(
             checkout.controldir)
         self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
@@ -693,7 +693,7 @@
         backing = self.get_transport()
         request = smart_dir.SmartServerRequestOpenBranchV2(backing)
         branch = self.make_branch('branch')
-        checkout = branch.create_checkout('reference',lightweight=True)
+        checkout = branch.create_checkout('reference', lightweight=True)
         reference_url = _mod_bzrbranch.BranchReferenceFormat().get_reference(
             checkout.controldir)
         self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
@@ -756,7 +756,7 @@
         backing = self.get_transport()
         request = smart_dir.SmartServerRequestOpenBranchV3(backing)
         branch = self.make_branch('branch')
-        checkout = branch.create_checkout('reference',lightweight=True)
+        checkout = branch.create_checkout('reference', lightweight=True)
         reference_url = _mod_bzrbranch.BranchReferenceFormat().get_reference(
             checkout.controldir)
         self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
@@ -835,7 +835,7 @@
         backing = self.get_transport()
         request = smart_branch.SmartServerBranchRequest(backing)
         branch = self.make_branch('branch')
-        checkout = branch.create_checkout('reference',lightweight=True)
+        checkout = branch.create_checkout('reference', lightweight=True)
         self.assertRaises(errors.NotBranchError,
             request.execute, 'checkout')
 

=== modified file 'breezy/tests/test_smart_transport.py'
--- breezy/tests/test_smart_transport.py	2017-07-21 13:51:15 +0000
+++ breezy/tests/test_smart_transport.py	2017-11-12 14:04:35 +0000
@@ -2055,10 +2055,10 @@
         """
         requester, response_handler = self.make_client_protocol()
         self.assertOffsetSerialisation([], '', requester)
-        self.assertOffsetSerialisation([(1,2)], '1,2', requester)
-        self.assertOffsetSerialisation([(10,40), (0,5)], '10,40\n0,5',
+        self.assertOffsetSerialisation([(1, 2)], '1,2', requester)
+        self.assertOffsetSerialisation([(10, 40), (0, 5)], '10,40\n0,5',
             requester)
-        self.assertOffsetSerialisation([(1,2), (3,4), (100, 200)],
+        self.assertOffsetSerialisation([(1, 2), (3, 4), (100, 200)],
             '1,2\n3,4\n100,200', requester)
 
 
@@ -2220,7 +2220,7 @@
             input, output, 'base')
         request = client_medium.get_request()
         smart_protocol = protocol.SmartClientRequestProtocolOne(request)
-        smart_protocol.call_with_body_readv_array(('foo', ), [(1,2),(5,6)])
+        smart_protocol.call_with_body_readv_array(('foo', ), [(1, 2), (5, 6)])
         self.assertEqual(expected_bytes, output.getvalue())
 
     def _test_client_read_response_tuple_raises_UnknownSmartMethod(self,
@@ -2494,7 +2494,7 @@
             input, output, 'base')
         request = client_medium.get_request()
         smart_protocol = self.client_protocol_class(request)
-        smart_protocol.call_with_body_readv_array(('foo', ), [(1,2),(5,6)])
+        smart_protocol.call_with_body_readv_array(('foo', ), [(1, 2), (5, 6)])
         self.assertEqual(expected_bytes, output.getvalue())
 
     def test_client_read_body_bytes_all(self):

=== modified file 'breezy/tests/test_strace.py'
--- breezy/tests/test_strace.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_strace.py	2017-11-12 14:04:35 +0000
@@ -80,7 +80,7 @@
 
         def function():
             return "foo"
-        result, strace_result = self.strace_detailed_or_skip(function,[], {},
+        result, strace_result = self.strace_detailed_or_skip(function, [], {},
                                                 follow_children=False)
         self.assertEqual("foo", result)
         self.assertIsInstance(strace_result, StraceResult)

=== modified file 'breezy/tests/test_textmerge.py'
--- breezy/tests/test_textmerge.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/test_textmerge.py	2017-11-12 14:04:35 +0000
@@ -35,7 +35,7 @@
         self.assertEqualDiff(''.join(mlines), expected)
 
     def test_reprocess(self):
-        struct = [('a', 'b'), ('c',), ('def','geh'), ('i',)]
+        struct = [('a', 'b'), ('c',), ('def', 'geh'), ('i',)]
         expect = [('a', 'b'), ('c',), ('d', 'g'), ('e',), ('f', 'h'), ('i',)]
         result = Merge2.reprocess_struct(struct)
         self.assertEqual(list(result), expect)

=== modified file 'breezy/tests/test_transactions.py'
--- breezy/tests/test_transactions.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/test_transactions.py	2017-11-12 14:04:35 +0000
@@ -57,7 +57,7 @@
 
     def test_register_dirty_raises(self):
         self.assertRaises(errors.ReadOnlyError,
-                          self.transaction.register_dirty,"anobject")
+                          self.transaction.register_dirty, "anobject")
 
     def test_map(self):
         self.assertNotEqual(None, getattr(self.transaction, "map", None))

=== modified file 'breezy/tests/test_transform.py'
--- breezy/tests/test_transform.py	2017-08-27 11:51:51 +0000
+++ breezy/tests/test_transform.py	2017-11-12 14:04:35 +0000
@@ -632,7 +632,7 @@
         create_tree.new_file('moving_file2', root, 'later2', 'mfile2')
         create_tree.apply()
 
-        mangle_tree,root = self.get_transform()
+        mangle_tree, root = self.get_transform()
         root = mangle_tree.root
         #swap names
         name1 = mangle_tree.trans_id_tree_file_id('name1')
@@ -660,23 +660,23 @@
         mangle_tree.apply()
         self.assertEqual(file(self.wt.abspath('name1')).read(), 'hello2')
         self.assertEqual(file(self.wt.abspath('name2')).read(), 'hello1')
-        mfile2_path = self.wt.abspath(pathjoin('new_directory','mfile2'))
+        mfile2_path = self.wt.abspath(pathjoin('new_directory', 'mfile2'))
         self.assertEqual(mangle_tree.final_parent(mfile2), newdir)
         self.assertEqual(file(mfile2_path).read(), 'later2')
         self.assertEqual(self.wt.id2path('mfile2'), 'new_directory/mfile2')
         self.assertEqual(self.wt.path2id('new_directory/mfile2'), 'mfile2')
-        newfile_path = self.wt.abspath(pathjoin('new_directory','newfile'))
+        newfile_path = self.wt.abspath(pathjoin('new_directory', 'newfile'))
         self.assertEqual(file(newfile_path).read(), 'hello3')
         self.assertEqual(self.wt.path2id('dying_directory'), 'ddir')
         self.assertIs(self.wt.path2id('dying_directory/dying_file'), None)
-        mfile2_path = self.wt.abspath(pathjoin('new_directory','mfile2'))
+        mfile2_path = self.wt.abspath(pathjoin('new_directory', 'mfile2'))
 
     def test_both_rename(self):
-        create_tree,root = self.get_transform()
+        create_tree, root = self.get_transform()
         newdir = create_tree.new_directory('selftest', root, 'selftest-id')
         create_tree.new_file('blackbox.py', newdir, 'hello1', 'blackbox-id')
         create_tree.apply()
-        mangle_tree,root = self.get_transform()
+        mangle_tree, root = self.get_transform()
         selftest = mangle_tree.trans_id_tree_file_id('selftest-id')
         blackbox = mangle_tree.trans_id_tree_file_id('blackbox-id')
         mangle_tree.adjust_path('test', root, selftest)
@@ -685,14 +685,14 @@
         mangle_tree.apply()
 
     def test_both_rename2(self):
-        create_tree,root = self.get_transform()
+        create_tree, root = self.get_transform()
         breezy = create_tree.new_directory('breezy', root, 'breezy-id')
         tests = create_tree.new_directory('tests', breezy, 'tests-id')
         blackbox = create_tree.new_directory('blackbox', tests, 'blackbox-id')
         create_tree.new_file('test_too_much.py', blackbox, 'hello1',
                              'test_too_much-id')
         create_tree.apply()
-        mangle_tree,root = self.get_transform()
+        mangle_tree, root = self.get_transform()
         breezy = mangle_tree.trans_id_tree_file_id('breezy-id')
         tests = mangle_tree.trans_id_tree_file_id('tests-id')
         test_too_much = mangle_tree.trans_id_tree_file_id('test_too_much-id')
@@ -702,12 +702,12 @@
         mangle_tree.apply()
 
     def test_both_rename3(self):
-        create_tree,root = self.get_transform()
+        create_tree, root = self.get_transform()
         tests = create_tree.new_directory('tests', root, 'tests-id')
         create_tree.new_file('test_too_much.py', tests, 'hello1',
                              'test_too_much-id')
         create_tree.apply()
-        mangle_tree,root = self.get_transform()
+        mangle_tree, root = self.get_transform()
         tests = mangle_tree.trans_id_tree_file_id('tests-id')
         test_too_much = mangle_tree.trans_id_tree_file_id('test_too_much-id')
         mangle_tree.adjust_path('selftest', root, tests)
@@ -752,7 +752,7 @@
         resolve_conflicts(replace)
         replace.apply()
 
-    def _test_symlinks(self, link_name1,link_target1,
+    def _test_symlinks(self, link_name1, link_target1,
                        link_name2, link_target2):
 
         def ozpath(p): return 'oz/' + p
@@ -810,12 +810,12 @@
                 os.symlink = os_symlink
 
     def get_conflicted(self):
-        create,root = self.get_transform()
+        create, root = self.get_transform()
         create.new_file('dorothy', root, 'dorothy', 'dorothy-id')
         oz = create.new_directory('oz', root, 'oz-id')
         create.new_directory('emeraldcity', oz, 'emerald-id')
         create.apply()
-        conflicts,root = self.get_transform()
+        conflicts, root = self.get_transform()
         # set up duplicate entry, duplicate id
         new_dorothy = conflicts.new_file('dorothy', root, 'dorothy',
                                          'dorothy-id')
@@ -3214,11 +3214,11 @@
 
     def test_merge_into_preview(self):
         work_tree = self.make_branch_and_tree('tree')
-        self.build_tree_contents([('tree/file','b\n')])
+        self.build_tree_contents([('tree/file', 'b\n')])
         work_tree.add('file', 'file-id')
         work_tree.commit('first commit')
         child_tree = work_tree.controldir.sprout('child').open_workingtree()
-        self.build_tree_contents([('child/file','b\nc\n')])
+        self.build_tree_contents([('child/file', 'b\nc\n')])
         child_tree.commit('child commit')
         child_tree.lock_write()
         self.addCleanup(child_tree.unlock)

=== modified file 'breezy/tests/test_tree.py'
--- breezy/tests/test_tree.py	2017-07-30 21:23:44 +0000
+++ breezy/tests/test_tree.py	2017-11-12 14:04:35 +0000
@@ -153,7 +153,7 @@
         # we need to pass a known file with an unknown file to get this to
         # fail when expected.
         delta = wt.changes_from(wt.basis_tree(),
-            specific_files=['known_file', 'unknown_file'] ,
+            specific_files=['known_file', 'unknown_file'],
             require_versioned=False)
         self.assertEqual(len(delta.added), 1)
 

=== modified file 'breezy/tests/test_tsort.py'
--- breezy/tests/test_tsort.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/test_tsort.py	2017-11-12 14:04:35 +0000
@@ -208,7 +208,7 @@
              'C': ['A', 'B']}.items(),
             'C',
             [(0, 'C', 0, (2,), False),
-             (1, 'B', 1, (1,1,1), True),
+             (1, 'B', 1, (1, 1, 1), True),
              (2, 'A', 0, (1,), True),
              ],
             True
@@ -232,8 +232,8 @@
                  }
         self.assertSortAndIterate(graph, 'F',
             [(0, 'F', 0, (3,), False),
-             (1, 'D', 1, (2,2,1), False),
-             (2, 'C', 2, (2,1,1), True),
+             (1, 'D', 1, (2, 2, 1), False),
+             (2, 'C', 2, (2, 1, 1), True),
              (3, 'B', 0, (2,), False),
              (4, 'A', 0, (1,), True),
              ], True)
@@ -255,9 +255,9 @@
                  }
         self.assertSortAndIterate(graph, 'F',
             [(0, 'F', 0, (3,), False),
-             (1, 'D', 1, (2,1,2), False),
-             (2, 'C', 2, (2,2,1), True),
-             (3, 'X', 1, (2,1,1), True),
+             (1, 'D', 1, (2, 1, 2), False),
+             (2, 'C', 2, (2, 2, 1), True),
+             (3, 'X', 1, (2, 1, 1), True),
              (4, 'B', 0, (2,), False),
              (5, 'A', 0, (1,), True),
              ], True)
@@ -308,12 +308,12 @@
              }.items(),
             'A',
             [(0, 'A', 0, (3,),  False),
-             (1, 'B', 1, (1,3,2), False),
-             (2, 'C', 1, (1,3,1), True),
+             (1, 'B', 1, (1, 3, 2), False),
+             (2, 'C', 1, (1, 3, 1), True),
              (3, 'D', 0, (2,), False),
-             (4, 'E', 1, (1,1,2), False),
-             (5, 'F', 2, (1,2,1), True),
-             (6, 'G', 1, (1,1,1), True),
+             (4, 'E', 1, (1, 1, 2), False),
+             (5, 'F', 2, (1, 2, 1), True),
+             (6, 'G', 1, (1, 1, 1), True),
              (7, 'H', 0, (1,), True),
              ],
             True
@@ -347,14 +347,14 @@
             }.items(),
             'L',
             [(0, 'L', 0, (6,), False),
-             (1, 'K', 1, (1,3,2), False),
-             (2, 'I', 1, (1,3,1), True),
+             (1, 'K', 1, (1, 3, 2), False),
+             (2, 'I', 1, (1, 3, 1), True),
              (3, 'J', 0, (5,), False),
-             (4, 'H', 1, (1,2,2), False),
-             (5, 'F', 1, (1,2,1), True),
+             (4, 'H', 1, (1, 2, 2), False),
+             (5, 'F', 1, (1, 2, 1), True),
              (6, 'G', 0, (4,), False),
-             (7, 'E', 1, (1,1,2), False),
-             (8, 'C', 1, (1,1,1), True),
+             (7, 'E', 1, (1, 1, 2), False),
+             (8, 'C', 1, (1, 1, 1), True),
              (9, 'D', 0, (3,), False),
              (10, 'B', 0, (2,), False),
              (11, 'A', 0, (1,),  True),
@@ -381,16 +381,16 @@
             }.items(),
             'N',
             [(0, 'N', 0, (7,), False),
-             (1, 'M', 1, (1,4,1), True),
+             (1, 'M', 1, (1, 4, 1), True),
              (2, 'L', 0, (6,), False),
-             (3, 'K', 1, (1,3,2), False),
-             (4, 'I', 1, (1,3,1), True),
+             (3, 'K', 1, (1, 3, 2), False),
+             (4, 'I', 1, (1, 3, 1), True),
              (5, 'J', 0, (5,), False),
-             (6, 'H', 1, (1,2,2), False),
-             (7, 'F', 1, (1,2,1), True),
+             (6, 'H', 1, (1, 2, 2), False),
+             (7, 'F', 1, (1, 2, 1), True),
              (8, 'G', 0, (4,), False),
-             (9, 'E', 1, (1,1,2), False),
-             (10, 'C', 1, (1,1,1), True),
+             (9, 'E', 1, (1, 1, 2), False),
+             (10, 'C', 1, (1, 1, 1), True),
              (11, 'D', 0, (3,), False),
              (12, 'B', 0, (2,), False),
              (13, 'A', 0, (1,),  True),
@@ -470,12 +470,12 @@
              },
             'A',
             [(0, 'A', 0, (2,), False),
-             (1, 'B', 1, (1,3,2), False),
-             (2, 'C', 2, (1,4,1), True),
-             (3, 'D', 1, (1,3,1), True),
-             (4, 'E', 1, (1,1,2), False),
-             (5, 'F', 2, (1,2,1), True),
-             (6, 'G', 1, (1,1,1), True),
+             (1, 'B', 1, (1, 3, 2), False),
+             (2, 'C', 2, (1, 4, 1), True),
+             (3, 'D', 1, (1, 3, 1), True),
+             (4, 'E', 1, (1, 1, 2), False),
+             (5, 'F', 2, (1, 2, 1), True),
+             (6, 'G', 1, (1, 1, 1), True),
              (7, 'H', 0, (1,), True),
              ],
             True
@@ -534,7 +534,7 @@
             'A',
             [(0, 'A', 0, (4,), False),
              (1, 'B', 0, (3,), False),
-             (2, 'C', 1, (2,1,1), True),
+             (2, 'C', 1, (2, 1, 1), True),
              ],
             True,
             mainline_revisions=['D', 'B', 'A']
@@ -583,7 +583,7 @@
              'C': ['A', 'B']}.items(),
             'C',
             [(0, 'C', 0, (2,), False),
-             (1, 'B', 1, (0,1,1), True),
+             (1, 'B', 1, (0, 1, 1), True),
              (2, 'A', 0, (1,), True),
              ],
             True
@@ -622,14 +622,14 @@
              }.items(),
             'J',
             [(0, 'J', 0, (4,), False),
-             (1, 'I', 1, (1,3,2), False),
-             (2, 'H', 1, (1,3,1), True),
+             (1, 'I', 1, (1, 3, 2), False),
+             (2, 'H', 1, (1, 3, 1), True),
              (3, 'G', 0, (3,), False),
-             (4, 'F', 1, (1,2,2), False),
-             (5, 'E', 1, (1,2,1), True),
+             (4, 'F', 1, (1, 2, 2), False),
+             (5, 'E', 1, (1, 2, 1), True),
              (6, 'D', 0, (2,), False),
-             (7, 'C', 1, (1,1,2), False),
-             (8, 'B', 1, (1,1,1), True),
+             (7, 'C', 1, (1, 1, 2), False),
+             (8, 'B', 1, (1, 1, 1), True),
              (9, 'A', 0, (1,), True),
              ],
             True
@@ -673,20 +673,20 @@
             }.items(),
             'R',
             [( 0, 'R', 0, (6,), False),
-             ( 1, 'Q', 1, (0,4,5), False),
-             ( 2, 'P', 2, (0,6,1), True),
-             ( 3, 'O', 1, (0,4,4), False),
-             ( 4, 'N', 1, (0,4,3), False),
-             ( 5, 'M', 2, (0,5,1), True),
-             ( 6, 'L', 1, (0,4,2), False),
-             ( 7, 'K', 1, (0,4,1), True),
+             ( 1, 'Q', 1, (0, 4, 5), False),
+             ( 2, 'P', 2, (0, 6, 1), True),
+             ( 3, 'O', 1, (0, 4, 4), False),
+             ( 4, 'N', 1, (0, 4, 3), False),
+             ( 5, 'M', 2, (0, 5, 1), True),
+             ( 6, 'L', 1, (0, 4, 2), False),
+             ( 7, 'K', 1, (0, 4, 1), True),
              ( 8, 'J', 0, (5,), False),
-             ( 9, 'I', 1, (0,3,1), True),
+             ( 9, 'I', 1, (0, 3, 1), True),
              (10, 'H', 0, (4,), False),
-             (11, 'G', 1, (0,1,3), False),
-             (12, 'F', 2, (0,2,1), True),
-             (13, 'E', 1, (0,1,2), False),
-             (14, 'D', 1, (0,1,1), True),
+             (11, 'G', 1, (0, 1, 3), False),
+             (12, 'F', 2, (0, 2, 1), True),
+             (13, 'E', 1, (0, 1, 2), False),
+             (14, 'D', 1, (0, 1, 1), True),
              (15, 'C', 0, (3,), False),
              (16, 'B', 0, (2,), False),
              (17, 'A', 0, (1,), True),

=== modified file 'breezy/tests/test_vf_search.py'
--- breezy/tests/test_vf_search.py	2017-06-08 23:30:31 +0000
+++ breezy/tests/test_vf_search.py	2017-11-12 14:04:35 +0000
@@ -133,11 +133,11 @@
                                 missing_keys=[NULL_REVISION])
 
     def test_partial_search(self):
-        parent_map = dict((k,extended_history_shortcut[k])
+        parent_map = dict((k, extended_history_shortcut[k])
                           for k in ['e', 'f'])
         self.assertSearchResult(['e', 'f'], ['d', 'a'], 2,
                                 parent_map)
-        parent_map.update((k,extended_history_shortcut[k])
+        parent_map.update((k, extended_history_shortcut[k])
                           for k in ['d', 'a'])
         self.assertSearchResult(['e', 'f'], ['c', NULL_REVISION], 4,
                                 parent_map)

=== modified file 'breezy/tests/test_weave.py'
--- breezy/tests/test_weave.py	2017-07-10 22:36:09 +0000
+++ breezy/tests/test_weave.py	2017-11-12 14:04:35 +0000
@@ -345,7 +345,7 @@
         k._parents = [frozenset(),
                 frozenset([0]),
                 frozenset([0]),
-                frozenset([0,1,2]),
+                frozenset([0, 1, 2]),
                 ]
         k._weave = [('{', 0),
                 'foo {',
@@ -378,7 +378,7 @@
         k._parents = [frozenset(),
                 frozenset([0]),
                 frozenset([0]),
-                frozenset([0,1,2]),
+                frozenset([0, 1, 2]),
                 ]
         k._weave = [('{', 0),
                 'foo {',

=== modified file 'breezy/tests/test_workingtree_4.py'
--- breezy/tests/test_workingtree_4.py	2017-07-31 22:36:57 +0000
+++ breezy/tests/test_workingtree_4.py	2017-11-12 14:04:35 +0000
@@ -781,7 +781,7 @@
             # Now add in an invalid entry, a rename with a dangling pointer
             state._dirblocks[1][1].append((('', 'foo', 'foo-id'),
                                             [('f', '', 0, False, ''),
-                                             ('r', 'bar', 0 , False, '')]))
+                                             ('r', 'bar', 0, False, '')]))
             self.assertListRaises(dirstate.DirstateCorrupt,
                                   tree.iter_changes, tree.basis_tree())
         finally:

=== modified file 'breezy/tests/test_wsgi.py'
--- breezy/tests/test_wsgi.py	2017-06-11 20:15:04 +0000
+++ breezy/tests/test_wsgi.py	2017-11-12 14:04:35 +0000
@@ -43,7 +43,7 @@
             'SERVER_PROTOCOL': 'HTTP/1.0',
 
             # Required WSGI variables
-            'wsgi.version': (1,0),
+            'wsgi.version': (1, 0),
             'wsgi.url_scheme': 'http',
             'wsgi.input': BytesIO(b''),
             'wsgi.errors': BytesIO(),
@@ -110,7 +110,7 @@
         })
         iterable = wsgi_app(environ, self.start_response)
         response = self.read_response(iterable)
-        self.assertEqual([('clone', 'foo/bar/')] , transport.calls)
+        self.assertEqual([('clone', 'foo/bar/')], transport.calls)
 
     def test_smart_wsgi_app_request_and_response(self):
         # SmartWSGIApp reads the smart request from the 'wsgi.input' file-like

=== modified file 'breezy/transport/ftp/__init__.py'
--- breezy/transport/ftp/__init__.py	2017-05-30 19:16:23 +0000
+++ breezy/transport/ftp/__init__.py	2017-11-12 14:04:35 +0000
@@ -296,7 +296,7 @@
         """
         abspath = self._remote_path(relpath)
         tmp_abspath = '%s.tmp.%.9f.%d.%d' % (abspath, time.time(),
-                        os.getpid(), random.randint(0,0x7FFFFFFF))
+                        os.getpid(), random.randint(0, 0x7FFFFFFF))
         bytes = None
         if getattr(fp, 'read', None) is None:
             # hand in a string IO

=== modified file 'breezy/transport/http/__init__.py'
--- breezy/transport/http/__init__.py	2017-06-11 20:15:04 +0000
+++ breezy/transport/http/__init__.py	2017-11-12 14:04:35 +0000
@@ -226,7 +226,7 @@
 
             except (errors.ShortReadvError, errors.InvalidRange,
                     errors.InvalidHttpRange, errors.HttpBoundaryMissing) as e:
-                mutter('Exception %r: %s during http._readv',e, e)
+                mutter('Exception %r: %s during http._readv', e, e)
                 if (not isinstance(e, errors.ShortReadvError)
                     or retried_offset == cur_offset_and_size):
                     # We don't degrade the range hint for ShortReadvError since

=== modified file 'breezy/transport/http/_urllib2_wrappers.py'
--- breezy/transport/http/_urllib2_wrappers.py	2017-09-26 00:55:04 +0000
+++ breezy/transport/http/_urllib2_wrappers.py	2017-11-12 14:04:35 +0000
@@ -267,7 +267,7 @@
     """
 
     # Some responses have bodies in which we have no interest
-    _body_ignored_responses = [301,302, 303, 307, 400, 401, 403, 404, 501]
+    _body_ignored_responses = [301, 302, 303, 307, 400, 401, 403, 404, 501]
 
     # in finish() below, we may have to discard several MB in the worst
     # case. To avoid buffering that much, we read and discard by chunks
@@ -784,7 +784,7 @@
             if 'http' in debug.debug_flags:
                 trace.mutter('> %s %s' % (method, url))
                 hdrs = []
-                for k,v in headers.items():
+                for k, v in headers.items():
                     # People are often told to paste -Dhttp output to help
                     # debug. Don't compromise credentials.
                     if k in ('Authorization', 'Proxy-Authorization'):
@@ -945,7 +945,7 @@
         # if we want to be sure, we MUST follow them.
 
         if code in (301, 302, 303, 307):
-            return Request(req.get_method(),newurl,
+            return Request(req.get_method(), newurl,
                            headers = req.headers,
                            origin_req_host = req.get_origin_req_host(),
                            unverifiable = True,

=== modified file 'breezy/transport/local.py'
--- breezy/transport/local.py	2017-06-10 01:57:00 +0000
+++ breezy/transport/local.py	2017-11-12 14:04:35 +0000
@@ -233,7 +233,7 @@
             # We couldn't create the file, maybe we need to create
             # the parent directory, and try again
             if (not create_parent_dir
-                or e.errno not in (errno.ENOENT,errno.ENOTDIR)):
+                or e.errno not in (errno.ENOENT, errno.ENOTDIR)):
                 self._translate_error(e, relpath)
             parent_dir = os.path.dirname(abspath)
             if not parent_dir:

=== modified file 'breezy/transport/log.py'
--- breezy/transport/log.py	2017-05-23 22:07:16 +0000
+++ breezy/transport/log.py	2017-11-12 14:04:35 +0000
@@ -119,7 +119,7 @@
                 self._shorten(val), result_len)
         elif methodname == 'readv':
             num_hunks = len(result)
-            total_bytes = sum((len(d) for o,d in result))
+            total_bytes = sum((len(d) for o, d in result))
             shown_result = "readv response, %d hunks, %d total bytes" % (
                 num_hunks, total_bytes)
             result_len = total_bytes

=== modified file 'breezy/transport/sftp.py'
--- breezy/transport/sftp.py	2017-08-26 13:06:15 +0000
+++ breezy/transport/sftp.py	2017-11-12 14:04:35 +0000
@@ -514,7 +514,7 @@
     def _put(self, abspath, f, mode=None):
         """Helper function so both put() and copy_abspaths can reuse the code"""
         tmp_abspath = '%s.tmp.%.9f.%d.%d' % (abspath, time.time(),
-                        os.getpid(), random.randint(0,0x7FFFFFFF))
+                        os.getpid(), random.randint(0, 0x7FFFFFFF))
         fout = self._sftp_open_exclusive(tmp_abspath, mode=mode)
         closed = False
         try:

=== modified file 'breezy/tree.py'
--- breezy/tree.py	2017-08-29 13:25:07 +0000
+++ breezy/tree.py	2017-11-12 14:04:35 +0000
@@ -653,7 +653,7 @@
         prefs = next(self.iter_search_rules([path], filter_pref_names))
         stk = filters._get_filter_stack_for(prefs)
         if 'filters' in debug.debug_flags:
-            trace.note(gettext("*** {0} content-filter: {1} => {2!r}").format(path,prefs,stk))
+            trace.note(gettext("*** {0} content-filter: {1} => {2!r}").format(path, prefs, stk))
         return stk
 
     def _content_filter_stack_provider(self):

=== modified file 'breezy/urlutils.py'
--- breezy/urlutils.py	2017-07-15 13:23:08 +0000
+++ breezy/urlutils.py	2017-11-12 14:04:35 +0000
@@ -686,7 +686,7 @@
 _hex_display_map = dict(([('%02x' % o, chr(o)) for o in range(256)]
                     + [('%02X' % o, chr(o)) for o in range(256)]))
 #These entries get mapped to themselves
-_hex_display_map.update((hex,'%'+hex) for hex in _no_decode_hex)
+_hex_display_map.update((hex, '%'+hex) for hex in _no_decode_hex)
 
 # These characters shouldn't be percent-encoded, and it's always safe to
 # unencode them if they are.
@@ -885,7 +885,7 @@
 
         if ':' in host and not (host[0] == '[' and host[-1] == ']'):
             # there *is* port
-            host, port = host.rsplit(':',1)
+            host, port = host.rsplit(':', 1)
             try:
                 port = int(port)
             except ValueError:

=== modified file 'breezy/util/_bencode_py.py'
--- breezy/util/_bencode_py.py	2017-06-16 20:54:19 +0000
+++ breezy/util/_bencode_py.py	2017-11-12 14:04:35 +0000
@@ -109,10 +109,10 @@
         self.bencoded = s
 
 
-def encode_bencached(x,r):
+def encode_bencached(x, r):
     r.append(x.bencoded)
 
-def encode_bool(x,r):
+def encode_bool(x, r):
     encode_int(int(x), r)
 
 def encode_int(x, r):
@@ -127,7 +127,7 @@
         encode_func[type(i)](i, r)
     r.append(b'e')
 
-def encode_dict(x,r):
+def encode_dict(x, r):
     r.append(b'd')
     ilist = sorted(x.items())
     for k, v in ilist:

=== modified file 'breezy/views.py'
--- breezy/views.py	2017-08-26 13:58:53 +0000
+++ breezy/views.py	2017-11-12 14:04:35 +0000
@@ -222,7 +222,7 @@
         """Convert view keywords and a view dictionary into a stream."""
         lines = [_VIEWS_FORMAT1_MARKER]
         for key in keywords:
-            line = "%s=%s\n" % (key,keywords[key])
+            line = "%s=%s\n" % (key, keywords[key])
             lines.append(line.encode('utf-8'))
         if view_dict:
             lines.append("views:\n".encode('utf-8'))

=== modified file 'breezy/win32utils.py'
--- breezy/win32utils.py	2017-06-05 23:54:45 +0000
+++ breezy/win32utils.py	2017-11-12 14:04:35 +0000
@@ -193,7 +193,7 @@
             pass
         else:
             buf = ctypes.create_unicode_buffer(MAX_PATH)
-            if SHGetSpecialFolderPath(None,buf,csidl,0):
+            if SHGetSpecialFolderPath(None, buf, csidl, 0):
                 return buf.value
 
     global has_win32com_shell