Merge lp:~marcustomlinson/update-manager/update-manager into lp:update-manager

[Marcus Tomlinson]

Fix pycodestyle and pyflakes autopkgtests.

[lp:~marcustomlinson/update-manager/update-manager]

2874. By Iain Lane on 2020-04-07

merge lp:~marcustomlinson/update-manager/update-manager

=== modified file 'UpdateManager/Dialogs.py'
--- UpdateManager/Dialogs.py	2020-04-02 00:18:15 +0000
+++ UpdateManager/Dialogs.py	2020-04-07 12:01:33 +0000
@@ -306,7 +306,7 @@
                         "2023-04-26.\n\nIf you reinstall Ubuntu from "
                         "ubuntu.com/download, future upgrades will "
                         "be available.") %
-                        (arch, meta_release.current_dist_version))
+                       (arch, meta_release.current_dist_version))
         self.focus_button = self.add_button(Gtk.STOCK_OK,
                                             self.window_main.close)
 
 
=== modified file 'UpdateManager/backend/__init__.py'
--- UpdateManager/backend/__init__.py	2020-04-06 11:40:13 +0000
+++ UpdateManager/backend/__init__.py	2020-04-07 12:01:33 +0000
@@ -16,7 +16,7 @@
 import os
 import re
 import subprocess
-from subprocess import PIPE, Popen
+from gettext import gettext as _
 from threading import Thread
 
 from UpdateManager.Core.MyCache import MyCache
@@ -147,7 +147,7 @@
                 snap_object['channel'] = to_channel
                 snap_list[snap] = snap_object
 
-        for snap, (_) in unseeded_snaps.items():
+        for snap, (from_channel) in unseeded_snaps.items():
             snap_object = {}
             # check if the snap is already installed
             snap_info = subprocess.Popen(["snap", "info", snap],
@@ -156,8 +156,8 @@
             if re.search("^installed: ", snap_info[0], re.MULTILINE):
                 logging.debug("Snap %s is installed" % snap)
                 # its not tracking the release channel so don't remove
-                from_channel = "stable/ubuntu-[0-9][0-9].[0-9][0-9]"
-                if not re.search(r"^tracking:.*%s" % from_channel,
+                re_channel = "stable/ubuntu-[0-9][0-9].[0-9][0-9]"
+                if not re.search(r"^tracking:.*%s" % re_channel,
                                  snap_info[0], re.MULTILINE):
                     logging.debug("Snap %s is not tracking the release channel"
                                   % snap)
@@ -276,7 +276,6 @@
     try:
         from .InstallBackendAptdaemon import InstallBackendAptdaemon
     except ImportError:
-        import logging
         logging.exception("importing aptdaemon")
 # try synaptic
 if os.path.exists("/usr/sbin/synaptic") \
@@ -284,7 +283,6 @@
     try:
         from .InstallBackendSynaptic import InstallBackendSynaptic
     except ImportError:
-        import logging
         logging.exception("importing synaptic")
 
 
@@ -297,7 +295,6 @@
         try:
             return InstallBackendAptdaemon(*args, **kwargs)
         except NameError:
-            import logging
             logging.exception("using aptdaemon failed")
     # try synaptic
     if (os.path.exists("/usr/sbin/synaptic")
 
=== modified file 'debian/changelog'
--- debian/changelog	2020-04-06 22:59:05 +0000
+++ debian/changelog	2020-04-07 12:01:33 +0000
@@ -1,3 +1,9 @@
+update-manager (1:20.04.4) UNRELEASED; urgency=medium
+
+  * Fix pycodestyle and pyflakes autopkgtests.
+
+ -- Marcus Tomlinson <[e-mail]>  Tue, 07 Apr 2020 10:04:05 +0100
+
 update-manager (1:20.04.3) focal; urgency=medium
 
   [ Gunnar Hjalmarsson ]