erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bridge: added check that synchronous method does not return a deferred

Browse source
This commit is contained in:
Goffi 2011-11-07 22:27:07 +01:00
commit 88d0fceb2a
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/bridge/DBus.py
View file

@ -42,6 +42,9 @@ class InternalError(dbus.DBusException):
class AsyncNotDeferred(dbus.DBusException):
_dbus_error_name = const_ERROR_PREFIX + ".AsyncNotDeferred"
class DeferredNotAsync(dbus.DBusException):
_dbus_error_name = const_ERROR_PREFIX + ".DeferredNotAsync"
class GenericException(dbus.DBusException):
def __init__(self, twisted_error):
super(GenericException,self).__init__()
@ -82,6 +85,9 @@ class DbusObject(dbus.service.Object):
result.addCallback(callback)
result.addErrback(lambda err:errback(GenericException(err)))
else:
if isinstance(result, Deferred):
error("Synchrone method [%s] return a Deferred." % name)
raise DeferredNotAsync
return result
### signals ###

6
src/bridge/bridge_constructor/dbus_core_template.py
View file

@ -42,6 +42,9 @@ class InternalError(dbus.DBusException):
class AsyncNotDeferred(dbus.DBusException):
_dbus_error_name = const_ERROR_PREFIX + ".AsyncNotDeferred"
class DeferredNotAsync(dbus.DBusException):
_dbus_error_name = const_ERROR_PREFIX + ".DeferredNotAsync"
class GenericException(dbus.DBusException):
def __init__(self, twisted_error):
super(GenericException,self).__init__()
@ -82,6 +85,9 @@ class DbusObject(dbus.service.Object):
result.addCallback(callback)
result.addErrback(lambda err:errback(GenericException(err)))
else:
if isinstance(result, Deferred):
error("Synchrone method [%s] return a Deferred." % name)
raise DeferredNotAsync
return result
### signals ###