Merge lp:~rbalint/update-manager/pep8-again into lp:update-manager

[Balint Reczey]

[Brian Murray (brian-murray)]

review: Approve

[Iain Lane (laney)]

laney@bionic> pycodestyle . --ignore=E265,E402,W503
laney@bionic>

Great, thanks!

review: Approve

=== modified file 'UpdateManager/ChangelogViewer.py'
--- UpdateManager/ChangelogViewer.py	2018-09-27 14:15:39 +0000
+++ UpdateManager/ChangelogViewer.py	2018-10-01 16:16:20 +0000
@@ -162,7 +162,7 @@
         # search for the next match in the buffer
         for (start_str, end_list, url_prefix) in search_items:
             # init
-            iter = buffer.get_iter_at_offset(iter_end.get_offset() \
+            iter = buffer.get_iter_at_offset(iter_end.get_offset()
                                              - len(content))
             while True:
                 ret = iter.forward_search(start_str,

=== modified file 'UpdateManager/Core/MetaRelease.py'
--- UpdateManager/Core/MetaRelease.py	2018-09-27 14:15:39 +0000
+++ UpdateManager/Core/MetaRelease.py	2018-10-01 16:16:20 +0000
@@ -344,7 +344,7 @@
             # sometime there is a root owned meta-relase file
             # there, try to remove it so that we get it
             # with proper permissions
-            if (os.path.exists(self.METARELEASE_FILE) \
+            if (os.path.exists(self.METARELEASE_FILE)
                     and not os.access(self.METARELEASE_FILE, os.W_OK)):
                 try:
                     os.unlink(self.METARELEASE_FILE)
@@ -381,7 +381,7 @@
             try:
                 self.parse()
             except Exception as e:
-                logging.exception("parse failed for '%s'" \
+                logging.exception("parse failed for '%s'"
                                   % self.METARELEASE_FILE)
                 # no use keeping a broken file around
                 os.remove(self.METARELEASE_FILE)

=== modified file 'UpdateManager/Core/MyCache.py'
--- UpdateManager/Core/MyCache.py	2018-09-27 14:15:39 +0000
+++ UpdateManager/Core/MyCache.py	2018-10-01 16:16:20 +0000
@@ -84,7 +84,7 @@
         # on broken packages, try to fix via saveDistUpgrade()
         if self._depcache.broken_count > 0:
             self.saveDistUpgrade()
-        assert (self._depcache.broken_count == 0 \
+        assert (self._depcache.broken_count == 0
                 and self._depcache.del_count == 0)
         self.launchpad = None
         # generate versioned_kernel_pkgs_regexp for later use
@@ -154,7 +154,7 @@
                 continue
             match = True
             for base_dep in dep_or:
-                if (base_dep.name != target.package.shortname \
+                if (base_dep.name != target.package.shortname
                     or not apt_pkg.check_dep(
                         target.version, base_dep.relation, base_dep.version)):
                     match = False
@@ -170,7 +170,7 @@
             candidate = cpkg.candidate
             if candidate is not None:
                 if (self._check_dependencies(
-                        target, candidate.get_dependencies("Conflicts")) \
+                        target, candidate.get_dependencies("Conflicts"))
                     and self._check_dependencies(
                         target, candidate.get_dependencies("Replaces"))):
                     logging.info(
@@ -192,7 +192,7 @@
                     wouldDelete -= 1
         if wouldDelete > 0:
             self.clear()
-            assert (self._depcache.broken_count == 0 \
+            assert (self._depcache.broken_count == 0
                     and self._depcache.del_count == 0)
         else:
             assert self._depcache.broken_count == 0
@@ -283,12 +283,12 @@
                 #
                 # for NEWS.Debian we do require the changelogver > installed
                 if strict_versioning:
-                    if (installed \
+                    if (installed
                             and apt_pkg.version_compare(changelogver,
                                                         installed) < 0):
                         break
                 else:
-                    if (installed \
+                    if (installed
                             and apt_pkg.version_compare(changelogver,
                                                         installed) == 0):
                         break

=== modified file 'UpdateManager/Core/UpdateList.py'
--- UpdateManager/Core/UpdateList.py	2018-09-27 14:15:39 +0000
+++ UpdateManager/Core/UpdateList.py	2018-10-01 16:16:20 +0000
@@ -102,8 +102,8 @@
             # This shouldn't really happen. If we land here often, it's a sign
             # that something has gone wrong. Unless all pkgs are None it's not
             # a critical issue - a hit to the performance at most.
-            reason = ((not pkg or not pkg.candidate) \
-                      and "Package was None or didn't have a candidate." \
+            reason = ((not pkg or not pkg.candidate)
+                      and "Package was None or didn't have a candidate."
                       or "%s already in _deps." % pkg.name)
             logging.debug("Useless call to _add_deps. %s" % reason)
             return
@@ -140,7 +140,7 @@
 
     def selection_is_inconsistent(self):
         pkgs_installing = [item for item in self.items if item.is_selected()]
-        return (len(pkgs_installing) > 0 \
+        return (len(pkgs_installing) > 0
                 and len(pkgs_installing) < len(self.items))
 
     def get_total_size(self):
@@ -338,7 +338,7 @@
         inst_ver = pkg._pkg.current_ver
         for ver in pkg._pkg.version_list:
             # discard is < than installed ver
-            if (inst_ver \
+            if (inst_ver
                     and apt.apt_pkg.version_compare(ver.ver_str,
                                                     inst_ver.ver_str) <= 0):
                 continue
@@ -507,13 +507,13 @@
                     upgrade_pkgs.append(pkg)
                 self.num_updates = self.num_updates + 1
 
-            if pkg.is_upgradable and not (pkg.marked_upgrade \
+            if pkg.is_upgradable and not (pkg.marked_upgrade
                                           or pkg.marked_install):
                 self.held_back.append(pkg.name)
                 continue
-            if (pkg.is_auto_removable \
-                and (cache.versioned_kernel_pkgs_regexp \
-                     and cache.versioned_kernel_pkgs_regexp.match(pkg.name) \
+            if (pkg.is_auto_removable
+                and (cache.versioned_kernel_pkgs_regexp
+                     and cache.versioned_kernel_pkgs_regexp.match(pkg.name)
                      and not cache.running_kernel_pkgs_regexp.match(
                          pkg.name))):
                 kernel_autoremove_pkgs.append(pkg)

=== modified file 'UpdateManager/Dialogs.py'
--- UpdateManager/Dialogs.py	2018-09-27 14:15:39 +0000
+++ UpdateManager/Dialogs.py	2018-10-01 16:16:20 +0000
@@ -368,7 +368,7 @@
         Dialog.start(self)
         # Turn off close button
         self.window_main.realize()
-        self.window_main.get_window().set_functions(Gdk.WMFunction.MOVE \
+        self.window_main.get_window().set_functions(Gdk.WMFunction.MOVE
                                                     | Gdk.WMFunction.MINIMIZE)
 
     def restart(self, *args, **kwargs):

=== modified file 'UpdateManager/UpdateManager.py'
--- UpdateManager/UpdateManager.py	2018-09-27 14:15:39 +0000
+++ UpdateManager/UpdateManager.py	2018-10-01 16:16:20 +0000
@@ -305,8 +305,8 @@
 
         # Check for new fresh release
         settings = Gio.Settings.new("com.ubuntu.update-manager")
-        if (self.meta_release.new_dist \
-                and (self.options.check_dist_upgrades \
+        if (self.meta_release.new_dist
+                and (self.options.check_dist_upgrades
                      or settings.get_boolean("check-dist-upgrades"))):
             return DistUpgradeDialog(self, self.meta_release)
 

=== modified file 'UpdateManager/UpdatesAvailable.py'
--- UpdateManager/UpdatesAvailable.py	2018-09-27 14:15:39 +0000
+++ UpdateManager/UpdatesAvailable.py	2018-10-01 16:16:20 +0000
@@ -531,11 +531,11 @@
         # set descr
         data = model.get_value(iter, LIST_UPDATE_DATA)
         item = data.item
-        if (item is None and data.group is not None \
+        if (item is None and data.group is not None
                 and data.group.core_item is not None):
             item = data.group.core_item
-        if (item is None or item.pkg is None \
-                or item.pkg.candidate is None \
+        if (item is None or item.pkg is None
+                or item.pkg.candidate is None
                 or item.pkg.candidate.description is None):
             changes_buffer = self.textview_changes.get_buffer()
             changes_buffer.set_text("")
@@ -724,7 +724,7 @@
         self.hbox_restart.set_visible(requires_restart)
 
     def _refresh_updates_count(self):
-        self.button_install.set_sensitive(self.cache.install_count \
+        self.button_install.set_sensitive(self.cache.install_count
                                           + self.cache.del_count)
         try:
             inst_count = self.cache.install_count + self.cache.del_count
@@ -889,7 +889,7 @@
             self.vbox_alerts.show()
             self.connected = False
         # in doubt (STATE_UNKNOWN), assume connected
-        elif (state in NetworkManagerHelper.NM_STATE_CONNECTED_LIST \
+        elif (state in NetworkManagerHelper.NM_STATE_CONNECTED_LIST
               or state == NetworkManagerHelper.NM_STATE_UNKNOWN):
             self.updates_changed()
             self.hbox_offline.hide()
@@ -1067,7 +1067,7 @@
 
         self.treeview_update.set_model(self.store)
         self.pkg_cell_area.indent_toplevel = (
-            bool(self.list.security_groups) \
+            bool(self.list.security_groups)
             or bool(self.list.kernel_autoremove_groups))
         self.update_close_button()
         self.update_count()

=== modified file 'UpdateManager/backend/__init__.py'
--- UpdateManager/backend/__init__.py	2018-09-27 14:15:39 +0000
+++ UpdateManager/backend/__init__.py	2018-10-01 16:16:20 +0000
@@ -46,10 +46,10 @@
                         if pkg.is_auto_installed:
                             pkgname += "#auto"
                         pkgs_install.append(pkgname)
-                    elif (pkg.marked_upgrade \
+                    elif (pkg.marked_upgrade
                           and fresh_cache[pkg.name].is_upgradable):
                         pkgs_upgrade.append(pkg.name)
-                    elif (pkg.marked_delete \
+                    elif (pkg.marked_delete
                           and fresh_cache[pkg.name].is_installed):
                         pkgs_remove.append(pkg.name)
                 except KeyError:
@@ -98,7 +98,7 @@
 def get_backend(*args, **kwargs):
     """Select and return a package manager backend."""
     # try aptdaemon
-    if (os.path.exists("/usr/sbin/aptd") \
+    if (os.path.exists("/usr/sbin/aptd")
             and "UPDATE_MANAGER_FORCE_BACKEND_SYNAPTIC" not in os.environ):
         # check if the gtkwidgets are installed as well
         try:
@@ -108,7 +108,7 @@
             import logging
             logging.exception("importing aptdaemon")
     # try synaptic
-    if (os.path.exists("/usr/sbin/synaptic") \
+    if (os.path.exists("/usr/sbin/synaptic")
             and "UPDATE_MANAGER_FORCE_BACKEND_APTDAEMON" not in os.environ):
         from .InstallBackendSynaptic import InstallBackendSynaptic
         return InstallBackendSynaptic(*args, **kwargs)

=== modified file 'debian/changelog'
--- debian/changelog	2018-09-27 14:16:35 +0000
+++ debian/changelog	2018-10-01 16:16:20 +0000
@@ -2,14 +2,15 @@
 
   * Allow unselecting updates and performing only removals (LP: #1792320)
   * Stop trying apt_pkg.pkgsystem_(un)lock(), as a normal user it always fails
+    (LP: #1795387)
   * Keep or delete packages after looping over all of them.
     This prevents the resolver from changing the packages in the loop resulting
     in not keeping some phased packages back from being upgraded. (LP: #1072136)
-  * Fix PEP 8 warnings
-    Also ignore "E502 the backslash is redundant between brackets" because the
-    additional brackets help readability.
+  * Fix PEP 8 warnings (LP: #1795384)
+    Also ignore "W503 line break before binary operator" because it will
+    become the best practice
 
- -- Balint Reczey <[e-mail]>  Thu, 27 Sep 2018 15:19:02 +0200
+ -- Balint Reczey <[e-mail]>  Mon, 01 Oct 2018 18:00:40 +0200
 
 update-manager (1:18.10.8) cosmic; urgency=medium
 

=== modified file 'debian/source_update-manager.py'
--- debian/source_update-manager.py	2018-09-27 14:15:39 +0000
+++ debian/source_update-manager.py	2018-10-01 16:16:20 +0000
@@ -27,8 +27,8 @@
     elif sp.returncode == 10:
         res = out.strip()
     else:
-        res = (b'Error: command ' + str(command).encode() \
-               + b' failed with exit code ' \
+        res = (b'Error: command ' + str(command).encode()
+               + b' failed with exit code '
                + str(sp.returncode).encode() + b': ' + out)
     return res
 

=== modified file 'janitor/plugincore/manager.py'
--- janitor/plugincore/manager.py	2018-09-27 14:15:39 +0000
+++ janitor/plugincore/manager.py	2018-10-01 16:16:20 +0000
@@ -81,8 +81,8 @@
         """Find and instantiate all plugins in a module."""
         def is_plugin(target):
             # Don't return the base class itself.
-            return (inspect.isclass(target) \
-                    and issubclass(target, Plugin) \
+            return (inspect.isclass(target)
+                    and issubclass(target, Plugin)
                     and target is not Plugin)
         plugin_classes = [
             member
@@ -177,8 +177,8 @@
         # condition.
         plugins = [
             plugin for plugin in self._plugins
-            if (plugin.condition == condition \
-                or condition in plugin.condition \
+            if (plugin.condition == condition
+                or condition in plugin.condition
                 or condition == '*')
         ]
         logging.debug("plugins for condition '{}' are '{}'".format(

=== modified file 'janitor/plugincore/plugins/kdelibs4to5_plugin.py'
--- janitor/plugincore/plugins/kdelibs4to5_plugin.py	2018-09-27 14:15:39 +0000
+++ janitor/plugincore/plugins/kdelibs4to5_plugin.py	2018-10-01 16:16:20 +0000
@@ -43,7 +43,7 @@
         fromp = 'kdelibs4-dev'
         top = 'kdelibs5-dev'
         cache = self.app.apt_cache
-        if (fromp in cache and cache[fromp].is_installed \
+        if (fromp in cache and cache[fromp].is_installed
                 and top in cache and not cache[top].is_installed):
             yield MissingPackageCruft(
                 cache[top],

=== modified file 'janitor/plugincore/plugins/langpack_manual_plugin.py'
--- janitor/plugincore/plugins/langpack_manual_plugin.py	2018-09-27 14:15:39 +0000
+++ janitor/plugincore/plugins/langpack_manual_plugin.py	2018-10-01 16:16:20 +0000
@@ -68,9 +68,9 @@
         # language-support-* - we fix this here
         cache = self.app.apt_cache
         for pkg in cache:
-            if (pkg.name.startswith('language-pack-') \
-                    and not pkg.name.endswith('-base') \
-                    and cache._depcache.IsAutoInstalled(pkg._pkg) \
+            if (pkg.name.startswith('language-pack-')
+                    and not pkg.name.endswith('-base')
+                    and cache._depcache.IsAutoInstalled(pkg._pkg)
                     and pkg.is_installed):
                 # Then...
                 logging.debug("setting '%s' to manual installed" % pkg.name)

=== modified file 'janitor/plugincore/tests/test_documentation.py'
--- janitor/plugincore/tests/test_documentation.py	2018-09-27 14:15:39 +0000
+++ janitor/plugincore/tests/test_documentation.py	2018-10-01 16:16:20 +0000
@@ -34,9 +34,9 @@
 COMMASPACE = ', '
 DOT = '.'
 DOCTEST_FLAGS = (
-    doctest.ELLIPSIS \
-    | doctest.NORMALIZE_WHITESPACE \
-    | doctest.REPORT_NDIFF \
+    doctest.ELLIPSIS
+    | doctest.NORMALIZE_WHITESPACE
+    | doctest.REPORT_NDIFF
     | doctest.IGNORE_EXCEPTION_DETAIL)
 
 

=== modified file 'tests/test_hwe_support_status.py'
--- tests/test_hwe_support_status.py	2018-09-27 14:15:39 +0000
+++ tests/test_hwe_support_status.py	2018-10-01 16:16:20 +0000
@@ -38,13 +38,13 @@
     )
 
     INSTALLED_UNSUPPORTED_HWE_PKG_NAMES = (
-        INSTALLED_UNSUPPORTED_HWE_KERNEL_PKG_NAMES \
+        INSTALLED_UNSUPPORTED_HWE_KERNEL_PKG_NAMES
         + INSTALLED_UNSUPPORTED_HWE_XORG_PKG_NAMES)
 
     def setUp(self):
         self.cache = []
-        INSTALL = (self.INSTALLED_UNSUPPORTED_HWE_PKG_NAMES \
-                   + self.INSTALLED_SUPPORTED_HWE_PKG_NAMES \
+        INSTALL = (self.INSTALLED_UNSUPPORTED_HWE_PKG_NAMES
+                   + self.INSTALLED_SUPPORTED_HWE_PKG_NAMES
                    + self.INSTALLED_OTHER_PKG_NAMES)
         for name in INSTALL:
             self.cache.append(make_mock_pkg(name))

=== modified file 'tests/test_pep8.py'
--- tests/test_pep8.py	2018-09-27 14:15:39 +0000
+++ tests/test_pep8.py	2018-10-01 16:16:20 +0000
@@ -6,7 +6,7 @@
 import unittest
 
 # pep8 is overdoing it a bit IMO
-IGNORE_PEP8 = "E265,E402,E502"
+IGNORE_PEP8 = "E265,E402,W503"
 IGNORE_FILES = (
 )
 

=== modified file 'tests/test_update_origin.py'
--- tests/test_update_origin.py	2018-09-27 14:15:39 +0000
+++ tests/test_update_origin.py	2018-10-01 16:16:20 +0000
@@ -90,9 +90,9 @@
                         if o.archive == "xenial-security":
                             had_security = True
                             break
-                if (is_in_updates \
-                        and not is_in_security \
-                        and had_security \
+                if (is_in_updates
+                        and not is_in_security
+                        and had_security
                         and len(pkg._pkg.version_list) > 2):
                     test_pkgs.add(pkg.name)
         self.assertTrue(len(test_pkgs) > 0,

=== modified file 'tests/test_utils.py'
--- tests/test_utils.py	2018-09-27 14:15:39 +0000
+++ tests/test_utils.py	2018-10-01 16:16:20 +0000
@@ -32,7 +32,7 @@
                         mock.mock_open(read_data=data)) as mock_file:
             assert open("/proc/1/stat").read() == data
             mock_file.assert_called_with("/proc/1/stat")
-            self.assertTrue(utils.is_child_of_process_name("init") \
+            self.assertTrue(utils.is_child_of_process_name("init")
                             or utils.is_child_of_process_name("systemd"))
             self.assertFalse(utils.is_child_of_process_name("mvo"))