Merge ~nteodosio/software-properties:xenial-ua into software-properties:ubuntu/xenial

[Nathan Teodosio]

From https://autopkgtest.ubuntu.com/results/autopkgtest-xenial/xenial/amd64/s/software-properties/20231025_143307_0491f@/log.gz:

  WARNING: syntax errors in softwareproperties/gtk/DialogUaAttach.py: invalid syntax (DialogUaAttach.py, line 154)

[Sebastien Bacher (seb128)]

Thanks

review: Approve

diff --git a/softwareproperties/gtk/DialogUaAttach.py b/softwareproperties/gtk/DialogUaAttach.py
index 6fcfc92..38b9044 100644
--- a/softwareproperties/gtk/DialogUaAttach.py
+++ b/softwareproperties/gtk/DialogUaAttach.py
@@ -151,7 +151,7 @@ class DialogUaAttach:
         except MagicAttachTokenError:
             GLib.idle_add(self.update_state, 'expired')
         except Exception as e:
-            print("Error getting the Ubuntu Pro token: ", e, flush = True)
+            print("Error getting the Ubuntu Pro token: ", e)
         finally:
             self.poll = None
 
diff --git a/softwareproperties/gtk/SoftwarePropertiesGtk.py b/softwareproperties/gtk/SoftwarePropertiesGtk.py
index 6257e93..5987e97 100644
--- a/softwareproperties/gtk/SoftwarePropertiesGtk.py
+++ b/softwareproperties/gtk/SoftwarePropertiesGtk.py
@@ -37,7 +37,6 @@ from aptdaemon.errors import NotAuthorizedError, TransactionFailed
 import logging
 import threading
 import sys
-import time
 
 import gi
 gi.require_version("Gdk", "3.0")