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

[Martin Packman]

Fix E71* lint errors

Mostly moving nots around and a few equality to idenity check changes.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/bzr/check.py'
--- breezy/bzr/check.py	2018-11-11 04:08:32 +0000
+++ breezy/bzr/check.py	2018-11-17 17:05:54 +0000
@@ -268,7 +268,7 @@
         self.ghosts.discard(rev_id)
         # Count all parents as ghosts if we haven't seen them yet.
         for parent in rev.parent_ids:
-            if not parent in self.planned_revisions:
+            if parent not in self.planned_revisions:
                 self.ghosts.add(parent)
 
         self.ancestors[rev_id] = tuple(rev.parent_ids) or (NULL_REVISION,)

=== modified file 'breezy/bzr/groupcompress.py'
--- breezy/bzr/groupcompress.py	2018-11-12 01:41:38 +0000
+++ breezy/bzr/groupcompress.py	2018-11-17 17:05:54 +0000
@@ -1628,7 +1628,7 @@
         """See VersionedFiles.get_sha1s()."""
         result = {}
         for record in self.get_record_stream(keys, 'unordered', True):
-            if record.sha1 != None:
+            if record.sha1 is not None:
                 result[record.key] = record.sha1
             else:
                 if record.storage_kind != 'absent':

=== modified file 'breezy/bzr/inventorytree.py'
--- breezy/bzr/inventorytree.py	2018-11-16 18:33:17 +0000
+++ breezy/bzr/inventorytree.py	2018-11-17 17:05:54 +0000
@@ -197,7 +197,7 @@
                 inventory_file_ids = []
                 for path in specific_files:
                     inventory, inv_file_id = self._path2inv_file_id(path)
-                    if not inventory is self.root_inventory:  # for now
+                    if inventory is not self.root_inventory:  # for now
                         raise AssertionError("%r != %r" % (
                             inventory, self.root_inventory))
                     inventory_file_ids.append(inv_file_id)
@@ -917,9 +917,9 @@
             changed_file_ids = set(changed_file_ids)
             for relpath, entry in self.target.root_inventory.iter_entries():
                 if (specific_file_ids is not None and
-                        not entry.file_id in specific_file_ids):
+                        entry.file_id not in specific_file_ids):
                     continue
-                if not entry.file_id in changed_file_ids:
+                if entry.file_id not in changed_file_ids:
                     yield (entry.file_id,
                            (relpath, relpath),  # Not renamed
                            False,  # Not modified

=== modified file 'breezy/bzr/remote.py'
--- breezy/bzr/remote.py	2018-11-11 04:08:32 +0000
+++ breezy/bzr/remote.py	2018-11-17 17:05:54 +0000
@@ -2268,7 +2268,7 @@
             unused.append(decompressor.unused_data)
         unused = b""
         while True:
-            while not b"\n" in unused:
+            while b"\n" not in unused:
                 try:
                     unused += next(byte_stream)
                 except StopIteration:

=== modified file 'breezy/bzr/repository.py'
--- breezy/bzr/repository.py	2018-11-11 04:08:32 +0000
+++ breezy/bzr/repository.py	2018-11-17 17:05:54 +0000
@@ -135,7 +135,7 @@
         control_files = self._create_control_files(a_bzrdir)
         control_files.lock_write()
         transport = control_files._transport
-        if shared == True:
+        if shared is True:
             utf8_files += [('shared-storage', b'')]
         try:
             for dir in dirs:

=== modified file 'breezy/bzr/smart/vfs.py'
--- breezy/bzr/smart/vfs.py	2018-11-11 04:08:32 +0000
+++ breezy/bzr/smart/vfs.py	2018-11-17 17:05:54 +0000
@@ -46,9 +46,9 @@
 
     the VFS is disabled when the BRZ_NO_SMART_VFS environment variable is set.
 
-    :return: True if it is enabled.
+    :return: ``True`` if it is enabled.
     """
-    return not 'BRZ_NO_SMART_VFS' in os.environ
+    return 'BRZ_NO_SMART_VFS' not in os.environ
 
 
 class VfsRequest(request.SmartServerRequest):

=== modified file 'breezy/git/fetch.py'
--- breezy/git/fetch.py	2018-11-16 18:33:17 +0000
+++ breezy/git/fetch.py	2018-11-17 17:05:54 +0000
@@ -138,7 +138,7 @@
             ie.revision = ptree.get_file_revision(ppath)
             break
         parent_key = (file_id, ptree.get_file_revision(ppath))
-        if not parent_key in parent_keys:
+        if parent_key not in parent_keys:
             parent_keys.append(parent_key)
     if ie.revision is None:
         # Need to store a new revision

=== modified file 'breezy/plugins/email/emailer.py'
--- breezy/plugins/email/emailer.py	2018-11-11 04:08:32 +0000
+++ breezy/plugins/email/emailer.py	2018-11-17 17:05:54 +0000
@@ -247,7 +247,7 @@
             msg.add_inline_attachment(diff, self.diff_filename())
 
         # Add revision_mail_headers to the headers
-        if header != None:
+        if header is None:
             for k, v in header.items():
                 msg[k] = v
 

=== modified file 'breezy/plugins/fastimport/helpers.py'
--- breezy/plugins/fastimport/helpers.py	2018-11-11 04:08:32 +0000
+++ breezy/plugins/fastimport/helpers.py	2018-11-17 17:05:54 +0000
@@ -121,9 +121,9 @@
 
 def kind_to_mode(kind, executable):
     if kind == "file":
-        if executable == True:
+        if executable is True:
             return stat.S_IFREG | 0o755
-        elif executable == False:
+        elif executable is False:
             return stat.S_IFREG | 0o644
         else:
             raise AssertionError("Executable %r invalid" % executable)

=== modified file 'breezy/plugins/fastimport/processors/generic_processor.py'
--- breezy/plugins/fastimport/processors/generic_processor.py	2018-11-11 04:08:32 +0000
+++ breezy/plugins/fastimport/processors/generic_processor.py	2018-11-17 17:05:54 +0000
@@ -310,7 +310,7 @@
             marks_file.export_marks(self.params.get("export-marks"),
                                     self.cache_mgr.marks)
 
-        if self.cache_mgr.reftracker.last_ref == None:
+        if self.cache_mgr.reftracker.last_ref is None:
             """Nothing to refresh"""
             return
 

=== modified file 'breezy/plugins/grep/cmds.py'
--- breezy/plugins/grep/cmds.py	2018-11-11 04:08:32 +0000
+++ breezy/plugins/grep/cmds.py	2018-11-17 17:05:54 +0000
@@ -178,11 +178,11 @@
             raise errors.BzrCommandError('Valid values for --color are '
                                          '"always", "never" or "auto".')
 
-        if levels == None:
+        if levels is None:
             levels = 1
 
         print_revno = False
-        if revision != None or levels == 0:
+        if revision is not None or levels == 0:
             # print revision numbers as we may be showing multiple revisions
             print_revno = True
 

=== modified file 'breezy/plugins/stats/cmds.py'
--- breezy/plugins/stats/cmds.py	2018-11-11 04:08:32 +0000
+++ breezy/plugins/stats/cmds.py	2018-11-17 17:05:54 +0000
@@ -311,7 +311,7 @@
             for delta in repository.get_deltas_for_revisions(revs):
                 pb.update("classifying commits", i, len(revs))
                 for c in classify_delta(delta):
-                    if not c in ret:
+                    if c not in ret:
                         ret[c] = 0
                     ret[c] += 1
                     total += 1
@@ -365,7 +365,7 @@
                     continue
                 for c in set(classify_delta(delta)):
                     for author in rev.get_apparent_authors():
-                        if not author in ret[c]:
+                        if author not in ret[c]:
                             ret[c][author] = 0
                         ret[c][author] += 1
 

=== modified file 'breezy/plugins/weave_fmt/store/__init__.py'
--- breezy/plugins/weave_fmt/store/__init__.py	2018-11-11 04:08:32 +0000
+++ breezy/plugins/weave_fmt/store/__init__.py	2018-11-17 17:05:54 +0000
@@ -215,7 +215,7 @@
         self._check_fileid(fileid)
         if suffixes:
             for suffix in suffixes:
-                if not suffix in self._suffixes:
+                if suffix not in self._suffixes:
                     raise ValueError("Unregistered suffix %r" % suffix)
                 self._check_fileid(suffix.encode('utf-8'))
         else:

=== modified file 'breezy/plugins/weave_fmt/workingtree.py'
--- breezy/plugins/weave_fmt/workingtree.py	2018-11-11 04:08:32 +0000
+++ breezy/plugins/weave_fmt/workingtree.py	2018-11-17 17:05:54 +0000
@@ -234,7 +234,7 @@
                                 text = False
                         except errors.NoSuchFile:
                             text = False
-                        if text == False:
+                        if text is False:
                             break
                 ctype = {True: 'text conflict',
                          False: 'contents conflict'}[text]

=== modified file 'breezy/push.py'
--- breezy/push.py	2018-11-16 18:40:46 +0000
+++ breezy/push.py	2018-11-17 17:05:54 +0000
@@ -162,7 +162,7 @@
                                                  " control directory, but not a branch or repository. This"
                                                  " is an unsupported configuration. Please move the target"
                                                  " directory out of the way and try again.") % location)
-        if push_result.workingtree_updated == False:
+        if push_result.workingtree_updated is False:
             warning("This transport does not update the working "
                     "tree of: %s. See 'brz help working-trees' for "
                     "more information." % push_result.target_branch.base)

=== modified file 'breezy/shelf.py'
--- breezy/shelf.py	2018-11-16 18:33:17 +0000
+++ breezy/shelf.py	2018-11-17 17:05:54 +0000
@@ -109,11 +109,11 @@
             # Also don't shelve deletion of tree root.
             if kind[1] is None and names[0] == '':
                 continue
-            if kind[0] is None or versioned[0] == False:
+            if kind[0] is None or versioned[0] is False:
                 self.creation[file_id] = (kind[1], names[1], parents[1],
                                           versioned)
                 yield ('add file', file_id, kind[1], paths[1])
-            elif kind[1] is None or versioned[0] == False:
+            elif kind[1] is None or versioned[0] is False:
                 self.deletion[file_id] = (kind[0], names[0], parents[0],
                                           versioned)
                 yield ('delete file', file_id, kind[0], paths[0])
@@ -150,7 +150,7 @@
     def shelve_all(self):
         """Shelve all changes.
 
-        :return: True if changes were shelved, False if there were no changes.
+        :return: ``True`` if changes were shelved, otherwise ``False``.
         """
         change = None
         for change in self.iter_shelvable():

=== modified file 'breezy/status.py'
--- breezy/status.py	2018-11-12 01:41:38 +0000
+++ breezy/status.py	2018-11-17 17:05:54 +0000
@@ -341,7 +341,7 @@
     s = old_tree.filter_unversioned_files(orig_paths)
     s = new_tree.filter_unversioned_files(s)
     nonexistent = [path for path in s if not new_tree.has_filename(path)]
-    remaining = [path for path in orig_paths if not path in nonexistent]
+    remaining = [path for path in orig_paths if path not in nonexistent]
     # Sorting the 'remaining' list doesn't have much effect in
     # practice, since the various status output sections will sort
     # their groups individually.  But for consistency of this

=== modified file 'breezy/symbol_versioning.py'
--- breezy/symbol_versioning.py	2018-11-12 01:41:38 +0000
+++ breezy/symbol_versioning.py	2018-11-17 17:05:54 +0000
@@ -79,7 +79,7 @@
         symbol = "%s.%s.%s" % (a_callable.__self__.__class__.__module__,
                                a_callable.__self__.__class__.__name__,
                                a_callable.__name__)
-    elif getattr(a_callable, '__qualname__', None) is not None and not '<' in a_callable.__qualname__:
+    elif getattr(a_callable, '__qualname__', None) is not None and '<' not in a_callable.__qualname__:
         symbol = "%s.%s" % (a_callable.__module__,
                             a_callable.__qualname__)
     else:

=== modified file 'breezy/tests/__init__.py'
--- breezy/tests/__init__.py	2018-11-16 12:32:43 +0000
+++ breezy/tests/__init__.py	2018-11-17 17:05:54 +0000
@@ -4544,7 +4544,7 @@
         # We don't want to fail here because some useful display will be lost
         # otherwise. Polluting the tmp dir is bad, but not giving all the
         # possible info to the test runner is even worse.
-        if test_id != None:
+        if test_id is not None:
             ui.ui_factory.clear_term()
             sys.stderr.write('\nWhile running: %s\n' % (test_id,))
         # Ugly, but the last thing we want here is fail, so bear with it.

=== modified file 'breezy/tests/test_config.py'
--- breezy/tests/test_config.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/test_config.py	2018-11-17 17:05:54 +0000
@@ -4597,7 +4597,7 @@
     def get_credentials(self, scheme, host, port=None, user=None,
                         path=None, realm=None):
         key = (scheme, host)
-        if not key in self._username:
+        if key not in self._username:
             return None
         return {"scheme": scheme, "host": host, "port": port,
                 "user": self._username[key], "password": self._password[key]}

=== modified file 'breezy/transport/__init__.py'
--- breezy/transport/__init__.py	2018-11-11 04:08:32 +0000
+++ breezy/transport/__init__.py	2018-11-17 17:05:54 +0000
@@ -134,14 +134,14 @@
 
 
 def register_lazy_transport(prefix, module, classname):
-    if not prefix in transport_list_registry:
+    if prefix not in transport_list_registry:
         register_transport_proto(prefix)
     transport_list_registry.register_lazy_transport_provider(
         prefix, module, classname)
 
 
 def register_transport(prefix, klass):
-    if not prefix in transport_list_registry:
+    if prefix not in transport_list_registry:
         register_transport_proto(prefix)
     transport_list_registry.register_transport_provider(prefix, klass)
 

=== modified file 'breezy/transport/memory.py'
--- breezy/transport/memory.py	2018-11-11 04:08:32 +0000
+++ breezy/transport/memory.py	2018-11-17 17:05:54 +0000
@@ -122,7 +122,7 @@
     def _check_parent(self, _abspath):
         dir = os.path.dirname(_abspath)
         if dir != '/':
-            if not dir in self._dirs:
+            if dir not in self._dirs:
                 raise NoSuchFile(_abspath)
 
     def has(self, relpath):
@@ -135,7 +135,7 @@
     def delete(self, relpath):
         """See Transport.delete()."""
         _abspath = self._abspath(relpath)
-        if not _abspath in self._files:
+        if _abspath not in self._files:
             raise NoSuchFile(relpath)
         del self._files[_abspath]
 
@@ -148,7 +148,7 @@
     def get(self, relpath):
         """See Transport.get()."""
         _abspath = self._abspath(relpath)
-        if not _abspath in self._files:
+        if _abspath not in self._files:
             if _abspath in self._dirs:
                 return LateReadError(relpath)
             else:
@@ -255,7 +255,7 @@
             if path.startswith(_abspath + '/') and path != _abspath:
                 self._translate_error(
                     IOError(errno.ENOTEMPTY, relpath), relpath)
-        if not _abspath in self._dirs:
+        if _abspath not in self._dirs:
             raise NoSuchFile(relpath)
         del self._dirs[_abspath]
 

=== modified file 'setup.cfg'
--- setup.cfg	2018-11-17 16:19:11 +0000
+++ setup.cfg	2018-11-17 17:05:54 +0000
@@ -24,10 +24,6 @@
    E502
    E702
    E704
-   E711
-   E712
-   E713
-   E714
    E722
    E731
    E741

=== modified file 'setup.py'
--- setup.py	2018-11-16 13:15:40 +0000
+++ setup.py	2018-11-17 17:05:54 +0000
@@ -743,7 +743,7 @@
 else:
     # ad-hoc for easy_install
     DATA_FILES = []
-    if not 'bdist_egg' in sys.argv:
+    if 'bdist_egg' not in sys.argv:
         # generate and install brz.1 only with plain install, not the
         # easy_install one
         DATA_FILES = [('man/man1', ['brz.1', 'breezy/git/git-remote-bzr.1'])]

=== modified file 'tools/win32/brz_postinstall.py'
--- tools/win32/brz_postinstall.py	2018-11-16 13:15:40 +0000
+++ tools/win32/brz_postinstall.py	2018-11-17 17:05:54 +0000
@@ -239,7 +239,7 @@
                     _winreg.SetValueEx(hkey, 'Path', 0, type_, path_u)
                     _winreg.FlushKey(hkey)
 
-        if not hkey is None:
+        if hkey not is None:
             _winreg.CloseKey(hkey)
 
     if (add_path or delete_path) and winver == 'Windows 98':
@@ -305,7 +305,7 @@
                             'EnvironmentError',
                             MB_OK | MB_ICONERROR)
 
-        if not hkey is None:
+        if hkey not is None:
             _winreg.SetValue(hkey, '', _winreg.REG_SZ, 'Brz Here')
             hkey2 = _winreg.CreateKey(hkey, 'command')
             _winreg.SetValue(hkey2, '', _winreg.REG_SZ,