Merge lp:~rbalint/update-manager/fix-pep8-cosmic into lp:update-manager

[Balint Reczey]

[Brian Murray (brian-murray)]

review: Approve

=== modified file 'UpdateManager/ChangelogViewer.py'
--- UpdateManager/ChangelogViewer.py	2017-08-07 19:42:06 +0000
+++ UpdateManager/ChangelogViewer.py	2018-09-27 14:23:26 +0000
@@ -162,8 +162,8 @@
         # 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() -
-                                             len(content))
+            iter = buffer.get_iter_at_offset(iter_end.get_offset() \
+                                             - len(content))
             while True:
                 ret = iter.forward_search(start_str,
                                           Gtk.TextSearchFlags.VISIBLE_ONLY,

=== modified file 'UpdateManager/Core/MetaRelease.py'
--- UpdateManager/Core/MetaRelease.py	2018-08-29 07:37:52 +0000
+++ UpdateManager/Core/MetaRelease.py	2018-09-27 14:23:26 +0000
@@ -344,8 +344,8 @@
             # 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) and
-                    not os.access(self.METARELEASE_FILE, os.W_OK)):
+            if (os.path.exists(self.METARELEASE_FILE) \
+                    and not os.access(self.METARELEASE_FILE, os.W_OK)):
                 try:
                     os.unlink(self.METARELEASE_FILE)
                 except OSError as e:
@@ -381,8 +381,8 @@
             try:
                 self.parse()
             except Exception as e:
-                logging.exception("parse failed for '%s'" %
-                                  self.METARELEASE_FILE)
+                logging.exception("parse failed for '%s'" \
+                                  % self.METARELEASE_FILE)
                 # no use keeping a broken file around
                 os.remove(self.METARELEASE_FILE)
             # we don't want to keep a meta-release file around when it

=== modified file 'UpdateManager/Core/MyCache.py'
--- UpdateManager/Core/MyCache.py	2018-09-24 09:41:09 +0000
+++ UpdateManager/Core/MyCache.py	2018-09-27 14:23:26 +0000
@@ -84,8 +84,8 @@
         # on broken packages, try to fix via saveDistUpgrade()
         if self._depcache.broken_count > 0:
             self.saveDistUpgrade()
-        assert (self._depcache.broken_count == 0 and
-                self._depcache.del_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
         apt_versioned_kernel_pkgs = apt_pkg.config.value_list(
@@ -154,8 +154,8 @@
                 continue
             match = True
             for base_dep in dep_or:
-                if (base_dep.name != target.package.shortname or
-                    not apt_pkg.check_dep(
+                if (base_dep.name != target.package.shortname \
+                    or not apt_pkg.check_dep(
                         target.version, base_dep.relation, base_dep.version)):
                     match = False
             if match:
@@ -170,8 +170,8 @@
             candidate = cpkg.candidate
             if candidate is not None:
                 if (self._check_dependencies(
-                        target, candidate.get_dependencies("Conflicts")) and
-                    self._check_dependencies(
+                        target, candidate.get_dependencies("Conflicts")) \
+                    and self._check_dependencies(
                         target, candidate.get_dependencies("Replaces"))):
                     logging.info(
                         "%s Conflicts/Replaces %s; allowing removal" % (
@@ -192,8 +192,8 @@
                     wouldDelete -= 1
         if wouldDelete > 0:
             self.clear()
-            assert (self._depcache.broken_count == 0 and
-                    self._depcache.del_count == 0)
+            assert (self._depcache.broken_count == 0 \
+                    and self._depcache.del_count == 0)
         else:
             assert self._depcache.broken_count == 0
         #self._apply_dselect_upgrade()
@@ -259,7 +259,7 @@
         #print(changelog.read())
         # do only get the lines that are new
         alllines = ""
-        regexp = "^%s \((.*)\)(.*)$" % (re.escape(srcpkg))
+        regexp = "^%s \\((.*)\\)(.*)$" % (re.escape(srcpkg))
 
         while True:
             line = changelog.readline().decode("UTF-8", "replace")
@@ -283,14 +283,14 @@
                 #
                 # for NEWS.Debian we do require the changelogver > installed
                 if strict_versioning:
-                    if (installed and
-                            apt_pkg.version_compare(changelogver,
-                                                    installed) < 0):
+                    if (installed \
+                            and apt_pkg.version_compare(changelogver,
+                                                        installed) < 0):
                         break
                 else:
-                    if (installed and
-                            apt_pkg.version_compare(changelogver,
-                                                    installed) == 0):
+                    if (installed \
+                            and apt_pkg.version_compare(changelogver,
+                                                        installed) == 0):
                         break
             alllines = alllines + line
         return alllines

=== modified file 'UpdateManager/Core/UpdateList.py'
--- UpdateManager/Core/UpdateList.py	2018-09-27 10:58:57 +0000
+++ UpdateManager/Core/UpdateList.py	2018-09-27 14:23:26 +0000
@@ -102,9 +102,9 @@
             # 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." or
-                      "%s already in _deps." % pkg.name)
+            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
         if len(self._deps) % 200 == 0 and callable(eventloop_callback):
@@ -140,8 +140,8 @@
 
     def selection_is_inconsistent(self):
         pkgs_installing = [item for item in self.items if item.is_selected()]
-        return (len(pkgs_installing) > 0 and
-                len(pkgs_installing) < len(self.items))
+        return (len(pkgs_installing) > 0 \
+                and len(pkgs_installing) < len(self.items))
 
     def get_total_size(self):
         if self.to_remove:
@@ -338,9 +338,9 @@
         inst_ver = pkg._pkg.current_ver
         for ver in pkg._pkg.version_list:
             # discard is < than installed ver
-            if (inst_ver and
-                    apt.apt_pkg.version_compare(ver.ver_str,
-                                                inst_ver.ver_str) <= 0):
+            if (inst_ver \
+                    and apt.apt_pkg.version_compare(ver.ver_str,
+                                                    inst_ver.ver_str) <= 0):
                 continue
             # check if we have a match
             for (verFileIter, index) in ver.file_list:
@@ -507,14 +507,15 @@
                     upgrade_pkgs.append(pkg)
                 self.num_updates = self.num_updates + 1
 
-            if pkg.is_upgradable and not (pkg.marked_upgrade or
-                                          pkg.marked_install):
+            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) and
-                 not cache.running_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)
 
         # perform operations after the loop to not skip packages which

=== modified file 'UpdateManager/Core/utils.py'
--- UpdateManager/Core/utils.py	2018-06-25 09:15:45 +0000
+++ UpdateManager/Core/utils.py	2018-09-27 14:23:26 +0000
@@ -318,7 +318,7 @@
     if proxies:
         # basic verification
         for proxy in proxies.values():
-            if not re.match("https?://\w+", proxy):
+            if not re.match("https?://\\w+", proxy):
                 print("proxy '%s' looks invalid" % proxy, file=sys.stderr)
                 return
         proxy_support = ProxyHandler(proxies)

=== modified file 'UpdateManager/Dialogs.py'
--- UpdateManager/Dialogs.py	2018-09-06 07:09:47 +0000
+++ UpdateManager/Dialogs.py	2018-09-27 14:23:26 +0000
@@ -368,8 +368,8 @@
         Dialog.start(self)
         # Turn off close button
         self.window_main.realize()
-        self.window_main.get_window().set_functions(Gdk.WMFunction.MOVE |
-                                                    Gdk.WMFunction.MINIMIZE)
+        self.window_main.get_window().set_functions(Gdk.WMFunction.MOVE \
+                                                    | Gdk.WMFunction.MINIMIZE)
 
     def restart(self, *args, **kwargs):
         self._request_reboot_via_session_manager()

=== modified file 'UpdateManager/UpdateManager.py'
--- UpdateManager/UpdateManager.py	2018-09-24 11:50:49 +0000
+++ UpdateManager/UpdateManager.py	2018-09-27 14:23:26 +0000
@@ -305,9 +305,9 @@
 
         # 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 or
-                 settings.get_boolean("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)
 
         return None

=== modified file 'UpdateManager/UpdatesAvailable.py'
--- UpdateManager/UpdatesAvailable.py	2018-09-24 09:41:09 +0000
+++ UpdateManager/UpdatesAvailable.py	2018-09-27 14:23:26 +0000
@@ -531,12 +531,12 @@
         # set descr
         data = model.get_value(iter, LIST_UPDATE_DATA)
         item = data.item
-        if (item is None and data.group is not None and
-                data.group.core_item 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 or
-                item.pkg.candidate.description 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("")
             desc_buffer = self.textview_descr.get_buffer()
@@ -724,8 +724,8 @@
         self.hbox_restart.set_visible(requires_restart)
 
     def _refresh_updates_count(self):
-        self.button_install.set_sensitive(self.cache.install_count +
-                                          self.cache.del_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
             self.dl_size = self.cache.required_download
@@ -889,8 +889,8 @@
             self.vbox_alerts.show()
             self.connected = False
         # in doubt (STATE_UNKNOWN), assume connected
-        elif (state in NetworkManagerHelper.NM_STATE_CONNECTED_LIST or
-              state == NetworkManagerHelper.NM_STATE_UNKNOWN):
+        elif (state in NetworkManagerHelper.NM_STATE_CONNECTED_LIST \
+              or state == NetworkManagerHelper.NM_STATE_UNKNOWN):
             self.updates_changed()
             self.hbox_offline.hide()
             self.connected = True
@@ -1067,8 +1067,8 @@
 
         self.treeview_update.set_model(self.store)
         self.pkg_cell_area.indent_toplevel = (
-            bool(self.list.security_groups) or
-            bool(self.list.kernel_autoremove_groups))
+            bool(self.list.security_groups) \
+            or bool(self.list.kernel_autoremove_groups))
         self.update_close_button()
         self.update_count()
         self.setBusy(False)

=== modified file 'UpdateManager/backend/InstallBackendAptdaemon.py'
--- UpdateManager/backend/InstallBackendAptdaemon.py	2018-09-24 11:50:49 +0000
+++ UpdateManager/backend/InstallBackendAptdaemon.py	2018-09-27 14:23:26 +0000
@@ -113,8 +113,8 @@
         label_details.set_label(get_status_string_from_enum(status))
         # Also resize the window if we switch from download details to
         # the terminal window
-        if (status == STATUS_COMMITTING and expander and
-                expander.terminal.get_visible()):
+        if status == STATUS_COMMITTING and expander \
+           and expander.terminal.get_visible():
             self._resize_to_show_details(expander)
 
     @inline_callbacks

=== modified file 'UpdateManager/backend/__init__.py'
--- UpdateManager/backend/__init__.py	2018-09-11 13:51:21 +0000
+++ UpdateManager/backend/__init__.py	2018-09-27 14:23:26 +0000
@@ -40,17 +40,17 @@
             fresh_cache = Cache(rootdir=self.window_main.cache.rootdir)
             for pkg in self.window_main.cache:
                 try:
-                    if pkg.marked_install and \
-                       not fresh_cache[pkg.name].is_installed:
+                    if pkg.marked_install \
+                       and not fresh_cache[pkg.name].is_installed:
                         pkgname = pkg.name
                         if pkg.is_auto_installed:
                             pkgname += "#auto"
                         pkgs_install.append(pkgname)
-                    elif (pkg.marked_upgrade and
-                          fresh_cache[pkg.name].is_upgradable):
+                    elif (pkg.marked_upgrade \
+                          and fresh_cache[pkg.name].is_upgradable):
                         pkgs_upgrade.append(pkg.name)
-                    elif (pkg.marked_delete and
-                          fresh_cache[pkg.name].is_installed):
+                    elif (pkg.marked_delete \
+                          and fresh_cache[pkg.name].is_installed):
                         pkgs_remove.append(pkg.name)
                 except KeyError:
                     # pkg missing from fresh_cache can't be modified
@@ -98,8 +98,8 @@
 def get_backend(*args, **kwargs):
     """Select and return a package manager backend."""
     # try aptdaemon
-    if (os.path.exists("/usr/sbin/aptd") and
-            "UPDATE_MANAGER_FORCE_BACKEND_SYNAPTIC" not in os.environ):
+    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:
             from .InstallBackendAptdaemon import InstallBackendAptdaemon
@@ -108,8 +108,8 @@
             import logging
             logging.exception("importing aptdaemon")
     # try synaptic
-    if (os.path.exists("/usr/sbin/synaptic") and
-            "UPDATE_MANAGER_FORCE_BACKEND_APTDAEMON" not in os.environ):
+    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)
     # nothing found, raise

=== modified file 'debian/changelog'
--- debian/changelog	2018-09-24 09:11:27 +0000
+++ debian/changelog	2018-09-27 14:23:26 +0000
@@ -1,3 +1,16 @@
+update-manager (1:18.10.9) cosmic; urgency=medium
+
+  * Allow unselecting updates and performing only removals (LP: #1792320)
+  * Stop trying apt_pkg.pkgsystem_(un)lock(), as a normal user it always fails
+  * 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.
+
+ -- Balint Reczey <[e-mail]>  Thu, 27 Sep 2018 15:19:02 +0200
+
 update-manager (1:18.10.8) cosmic; urgency=medium
 
   * Print transaction error and let the user try again applying updates

=== modified file 'debian/source_update-manager.py'
--- debian/source_update-manager.py	2017-08-07 20:54:58 +0000
+++ debian/source_update-manager.py	2018-09-27 14:23:26 +0000
@@ -27,9 +27,9 @@
     elif sp.returncode == 10:
         res = out.strip()
     else:
-        res = (b'Error: command ' + str(command).encode() +
-               b' failed with exit code ' +
-               str(sp.returncode).encode() + b': ' + out)
+        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	2012-06-28 00:11:57 +0000
+++ janitor/plugincore/manager.py	2018-09-27 14:23:26 +0000
@@ -81,9 +81,9 @@
         """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) and
-                    target is not Plugin)
+            return (inspect.isclass(target) \
+                    and issubclass(target, Plugin) \
+                    and target is not Plugin)
         plugin_classes = [
             member
             for name, member in inspect.getmembers(module, is_plugin)
@@ -177,9 +177,9 @@
         # condition.
         plugins = [
             plugin for plugin in self._plugins
-            if (plugin.condition == condition or
-                condition in plugin.condition or
-                condition == '*')
+            if (plugin.condition == condition \
+                or condition in plugin.condition \
+                or condition == '*')
         ]
         logging.debug("plugins for condition '{}' are '{}'".format(
             condition, plugins))

=== modified file 'janitor/plugincore/plugins/dpkg_status_plugin.py'
--- janitor/plugincore/plugins/dpkg_status_plugin.py	2012-06-27 21:49:20 +0000
+++ janitor/plugincore/plugins/dpkg_status_plugin.py	2018-09-27 14:23:26 +0000
@@ -70,9 +70,9 @@
             while tagf.step():
                 statusline = tagf.section.get('Status')
                 (want, flag, status) = statusline.split()
-                if (want == 'purge' and
-                        flag == 'ok' and
-                        status == 'not-installed'):
+                if want == 'purge' \
+                   and flag == 'ok' \
+                   and status == 'not-installed':
                     # Then...
                     n_cruft += 1
         logging.debug('DpkgStatusPlugin found {} cruft items'.format(n_cruft))

=== modified file 'janitor/plugincore/plugins/kdelibs4to5_plugin.py'
--- janitor/plugincore/plugins/kdelibs4to5_plugin.py	2012-06-27 21:49:20 +0000
+++ janitor/plugincore/plugins/kdelibs4to5_plugin.py	2018-09-27 14:23:26 +0000
@@ -43,8 +43,8 @@
         fromp = 'kdelibs4-dev'
         top = 'kdelibs5-dev'
         cache = self.app.apt_cache
-        if (fromp in cache and cache[fromp].is_installed and
-                top in cache and not cache[top].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],
                 _('When upgrading, if kdelibs4-dev is installed, '

=== modified file 'janitor/plugincore/plugins/langpack_manual_plugin.py'
--- janitor/plugincore/plugins/langpack_manual_plugin.py	2012-06-27 21:49:20 +0000
+++ janitor/plugincore/plugins/langpack_manual_plugin.py	2018-09-27 14:23:26 +0000
@@ -68,10 +68,10 @@
         # 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) and
-                    pkg.is_installed):
+            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)
                 yield ManualInstallCruft(pkg)

=== modified file 'janitor/plugincore/tests/test_documentation.py'
--- janitor/plugincore/tests/test_documentation.py	2017-08-07 20:54:58 +0000
+++ janitor/plugincore/tests/test_documentation.py	2018-09-27 14:23:26 +0000
@@ -34,10 +34,10 @@
 COMMASPACE = ', '
 DOT = '.'
 DOCTEST_FLAGS = (
-    doctest.ELLIPSIS |
-    doctest.NORMALIZE_WHITESPACE |
-    doctest.REPORT_NDIFF |
-    doctest.IGNORE_EXCEPTION_DETAIL)
+    doctest.ELLIPSIS \
+    | doctest.NORMALIZE_WHITESPACE \
+    | doctest.REPORT_NDIFF \
+    | doctest.IGNORE_EXCEPTION_DETAIL)
 
 
 WHOAMI = 'janitor.plugincore'

=== modified file 'tests/test_hwe_support_status.py'
--- tests/test_hwe_support_status.py	2017-08-07 20:54:58 +0000
+++ tests/test_hwe_support_status.py	2018-09-27 14:23:26 +0000
@@ -38,14 +38,14 @@
     )
 
     INSTALLED_UNSUPPORTED_HWE_PKG_NAMES = (
-        INSTALLED_UNSUPPORTED_HWE_KERNEL_PKG_NAMES +
-        INSTALLED_UNSUPPORTED_HWE_XORG_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 +
-                   self.INSTALLED_OTHER_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	2017-08-07 20:54:58 +0000
+++ tests/test_pep8.py	2018-09-27 14:23:26 +0000
@@ -6,7 +6,7 @@
 import unittest
 
 # pep8 is overdoing it a bit IMO
-IGNORE_PEP8 = "E265,E402"
+IGNORE_PEP8 = "E265,E402,E502"
 IGNORE_FILES = (
 )
 

=== modified file 'tests/test_update_origin.py'
--- tests/test_update_origin.py	2017-09-11 10:39:17 +0000
+++ tests/test_update_origin.py	2018-09-27 14:23:26 +0000
@@ -90,10 +90,10 @@
                         if o.archive == "xenial-security":
                             had_security = True
                             break
-                if (is_in_updates and
-                        not is_in_security and
-                        had_security and
-                        len(pkg._pkg.version_list) > 2):
+                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,
                         "no suitable test package found that has a version in "

=== modified file 'tests/test_utils.py'
--- tests/test_utils.py	2017-08-30 16:55:46 +0000
+++ tests/test_utils.py	2018-09-27 14:23:26 +0000
@@ -32,8 +32,8 @@
                         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") or
-                            utils.is_child_of_process_name("systemd"))
+            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"))
 
     def test_is_port_listening(self):