Merge ~marcoscarvalho46/ubuntu/+source/aptdaemon:ubuntu/devel into ubuntu/+source/aptdaemon:ubuntu/devel

[Marcos]

[Fix] Use of 'async' as a variable name as that is now a keyword in Python 3.7.

[Julian Andres Klode (juliank)]

This has been fixed already in debian/patches/python3.7-compat.patch on platforms with 3.7

review: Disapprove

Unmerged commits

46b9d03... by Marcos on 2020-10-19

[Fix] Use of 'async' as a variable name as that is now a keyword in Python 3.7.

diff --git a/aptdaemon/client.py b/aptdaemon/client.py
index c9fccd2..c694a9e 100644
--- a/aptdaemon/client.py
+++ b/aptdaemon/client.py
@@ -1561,12 +1561,12 @@ class AptClient(object):
 
     def _run_transaction(self, method_name, args, wait, reply_handler,
                          error_handler):
-        async = reply_handler and error_handler
+        has_async = reply_handler and error_handler
         try:
             deferred = self._run_transaction_helper(method_name, args, wait,
-                                                    async)
+                                                    has_async)
         except Exception as error:
-            if async:
+            if has_async:
                 error_handler(error)
                 return
             else:
@@ -1603,10 +1603,10 @@ class AptClient(object):
                 return trans
 
     @defer.inline_callbacks
-    def _run_transaction_helper(self, method_name, args, wait, async):
+    def _run_transaction_helper(self, method_name, args, wait, has_async):
         daemon = get_aptdaemon(self.bus)
         dbus_method = daemon.get_dbus_method(method_name)
-        if async:
+        if has_async:
             deferred = defer.Deferred()
             dbus_method(reply_handler=deferred.callback,
                         error_handler=deferred.errback, *args, timeout=86400)
@@ -1619,7 +1619,7 @@ class AptClient(object):
         if self.terminal:
             yield trans.set_terminal(self.terminal)
         yield trans.sync()
-        if wait and async:
+        if wait and has_async:
             deferred_wait = defer.Deferred()
             sig = trans.connect("finished",
                                 lambda trans, exit: