Attachment 46834 Details for Bug 36206 – proposed patch

[patch] proposed patch

0001-_ProxyMethod-allow-an-explicit-signature-to-be-given.patch (text/plain), 3.79 KB, created by Simon McVittie on 2011-05-17 10:55:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-05-17 10:55:33 UTC

Size: 3.79 KB

patch

obsolete

>From d7fc82ab5433cb01f91ae354462e81f5b6bb5efb Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 17 May 2011 18:54:55 +0100
>Subject: [PATCH] _ProxyMethod: allow an explicit signature to be given to
> method calls
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36206
>---
> dbus/proxies.py |   31 ++++++++++++++++++-------------
> 1 files changed, 18 insertions(+), 13 deletions(-)
>
>diff --git a/dbus/proxies.py b/dbus/proxies.py
>index ebdc583..bf99a1c 100644
>--- a/dbus/proxies.py
>+++ b/dbus/proxies.py
>@@ -102,6 +102,7 @@ class _ProxyMethod:
>         reply_handler = keywords.pop('reply_handler', None)
>         error_handler = keywords.pop('error_handler', None)
>         ignore_reply = keywords.pop('ignore_reply', False)
>+        signature = keywords.pop('signature', None)
> 
>         if reply_handler is not None or error_handler is not None:
>             if reply_handler is None:
>@@ -114,18 +115,20 @@ class _ProxyMethod:
> 
>         dbus_interface = keywords.pop('dbus_interface', self._dbus_interface)
> 
>-        if dbus_interface is None:
>-            key = self._method_name
>-        else:
>-            key = dbus_interface + '.' + self._method_name
>-        introspect_sig = self._proxy._introspect_method_map.get(key, None)
>+        if signature is None:
>+            if dbus_interface is None:
>+                key = self._method_name
>+            else:
>+                key = dbus_interface + '.' + self._method_name
>+
>+            signature = self._proxy._introspect_method_map.get(key, None)
> 
>         if ignore_reply or reply_handler is not None:
>             self._connection.call_async(self._named_service,
>                                         self._object_path,
>                                         dbus_interface,
>                                         self._method_name,
>-                                        introspect_sig,
>+                                        signature,
>                                         args,
>                                         reply_handler,
>                                         error_handler,
>@@ -135,27 +138,29 @@ class _ProxyMethod:
>                                                   self._object_path,
>                                                   dbus_interface,
>                                                   self._method_name,
>-                                                  introspect_sig,
>+                                                  signature,
>                                                   args,
>                                                   **keywords)
> 
>     def call_async(self, *args, **keywords):
>         reply_handler = keywords.pop('reply_handler', None)
>         error_handler = keywords.pop('error_handler', None)
>+        signature = keywords.pop('signature', None)
> 
>         dbus_interface = keywords.pop('dbus_interface', self._dbus_interface)
> 
>-        if dbus_interface:
>-            key = dbus_interface + '.' + self._method_name
>-        else:
>-            key = self._method_name
>-        introspect_sig = self._proxy._introspect_method_map.get(key, None)
>+        if signature is None:
>+            if dbus_interface:
>+                key = dbus_interface + '.' + self._method_name
>+            else:
>+                key = self._method_name
>+            signature = self._proxy._introspect_method_map.get(key, None)
> 
>         self._connection.call_async(self._named_service,
>                                     self._object_path,
>                                     dbus_interface,
>                                     self._method_name,
>-                                    introspect_sig,
>+                                    signature,
>                                     args,
>                                     reply_handler,
>                                     error_handler,
>-- 
>1.7.5.1
>

Actions: View | Splinter Review

Attachments on bug 36206: 45577 | 46834

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.