From a81f1e90b293f1279ad4797753649f4264c559f3 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 24 Apr 2007 14:49:44 +0100 Subject: [PATCH] Revert the part of the previous patch that added dbus_name to signals. Making this work correctly will also require changes to the introspect code. --- dbus/decorators.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/dbus/decorators.py b/dbus/decorators.py index 2b0d539..aa08940 100644 --- a/dbus/decorators.py +++ b/dbus/decorators.py @@ -162,13 +162,12 @@ def method(dbus_interface, in_signature=None, out_signature=None, return decorator -def signal(dbus_interface, signature=None, dbus_name=None, path_keyword=None): +def signal(dbus_interface, signature=None, path_keyword=None): """Factory for decorators used to mark methods of a `dbus.service.Object` to emit signals on the D-Bus. Whenever the decorated method is called in Python, after the method - body is executed, a signal whose name is `dbus_name` (or if `dbus_name` - is None, a signal with the same name as the decorated method), + body is executed, a signal with the same name as the decorated method, with the given D-Bus interface, will be emitted from this object. :Parameters: @@ -177,10 +176,6 @@ def signal(dbus_interface, signature=None, dbus_name=None, path_keyword=None): `signature` : str The signature of the signal in the usual D-Bus notation - `dbus_name` : str or None - The signal to be emitted when the decorated method is called. - If None, use the name (``__name__``) of the decorated method. - `path_keyword` : str or None A keyword argument to the decorated method. If not None, that argument will not be emitted as an argument of @@ -193,9 +188,7 @@ def signal(dbus_interface, signature=None, dbus_name=None, path_keyword=None): """ _dbus_bindings.validate_interface_name(dbus_interface) def decorator(func): - member_name = dbus_name - if member_name is None: - member_name = func.__name__ + member_name = func.__name__ _dbus_bindings.validate_member_name(member_name) def emit_signal(self, *args, **keywords): -- 2.11.4.GIT