From e1d32d76231b1051a2380995f4a7822aa525375a Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 11 Jul 2018 11:57:06 +0100 Subject: [PATCH] Python: Avoid identifier 'async', which became a keyword in 3.7 This is an incompatible change, but so is async becoming an identifier. Fixes: #565 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=903558 Signed-off-by: Simon McVittie --- src/libide/Ide.py | 6 +++--- src/plugins/jedi/jedi_plugin.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libide/Ide.py b/src/libide/Ide.py index 02bb61937..07d429c7a 100644 --- a/src/libide/Ide.py +++ b/src/libide/Ide.py @@ -41,9 +41,9 @@ class _Gio_DBusMethodInfo: in_args = None out_signature = None -def DBusMethod(dbus_interface, in_signature=None, out_signature=None, async=False): +def DBusMethod(dbus_interface, in_signature=None, out_signature=None, is_async=False): def decorator(func): - func._is_async = async + func._is_async = is_async func._dbus_method = _Gio_DBusMethodInfo() func._dbus_method.interface = dbus_interface @@ -54,7 +54,7 @@ def DBusMethod(dbus_interface, in_signature=None, out_signature=None, async=Fals in_signature_list = GLib.Variant.split_signature('('+in_signature+')') arg_names = inspect.getargspec(func).args arg_names.pop(0) # eat "self" argument - if async: arg_names.pop(0) # eat "invocation" + if is_async: arg_names.pop(0) # eat "invocation" if len(in_signature) != len(arg_names): raise TypeError('specified signature %s for method %s does not match length of arguments' % (str(in_signature_list), func.func_name)) for pair in zip(in_signature_list, arg_names): diff --git a/src/plugins/jedi/jedi_plugin.py b/src/plugins/jedi/jedi_plugin.py index 84bd11c27..a346a342e 100644 --- a/src/plugins/jedi/jedi_plugin.py +++ b/src/plugins/jedi/jedi_plugin.py @@ -688,7 +688,7 @@ class JediService(Ide.DBusService): self.queue = {} self.handler_id = 0 - @Ide.DBusMethod('org.gnome.builder.plugins.jedi', in_signature='siis', out_signature='a(issass)', async=True) + @Ide.DBusMethod('org.gnome.builder.plugins.jedi', in_signature='siis', out_signature='a(issass)', is_async=True) def CodeComplete(self, invocation, filename, line, column, content): if filename in self.queue: request = self.queue.pop(filename) -- 2.17.0