bridge (dbus): fix BridgeException conversion for AIOBridge
This commit is contained in:
parent
681ff4d1c4
commit
45112fb22e
2 changed files with 10 additions and 8 deletions
|
|
@ -155,6 +155,10 @@ class bridge:
|
||||||
)
|
)
|
||||||
return d
|
return d
|
||||||
|
|
||||||
|
def _errback(self, failure_):
|
||||||
|
"""Convert Failure to BridgeException"""
|
||||||
|
raise dbus_to_bridge_exception(failure_)
|
||||||
|
|
||||||
def call(self, name: str, *args, **kwargs):
|
def call(self, name: str, *args, **kwargs):
|
||||||
"""Call a remote method.
|
"""Call a remote method.
|
||||||
|
|
||||||
|
|
@ -271,6 +275,7 @@ class AIOBridge(bridge):
|
||||||
@param name: name of the bridge method
|
@param name: name of the bridge method
|
||||||
"""
|
"""
|
||||||
d = super().call(name, *args, **kwargs)
|
d = super().call(name, *args, **kwargs)
|
||||||
|
d.addErrback(self._errback)
|
||||||
return d.asFuture(asyncio.get_event_loop())
|
return d.asFuture(asyncio.get_event_loop())
|
||||||
|
|
||||||
async def bridge_connect(self):
|
async def bridge_connect(self):
|
||||||
|
|
@ -336,10 +341,6 @@ class TwistedBridge(bridge):
|
||||||
"""
|
"""
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def _errback(self, failure_):
|
|
||||||
"""Convert Failure to BridgeException"""
|
|
||||||
raise dbus_to_bridge_exception(failure_)
|
|
||||||
|
|
||||||
def call(self, name, *args, **kwargs):
|
def call(self, name, *args, **kwargs):
|
||||||
"""Call a remote method and return a Deferred.
|
"""Call a remote method and return a Deferred.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -155,6 +155,10 @@ class bridge:
|
||||||
)
|
)
|
||||||
return d
|
return d
|
||||||
|
|
||||||
|
def _errback(self, failure_):
|
||||||
|
"""Convert Failure to BridgeException"""
|
||||||
|
raise dbus_to_bridge_exception(failure_)
|
||||||
|
|
||||||
def call(self, name: str, *args, **kwargs):
|
def call(self, name: str, *args, **kwargs):
|
||||||
"""Call a remote method.
|
"""Call a remote method.
|
||||||
|
|
||||||
|
|
@ -953,6 +957,7 @@ class AIOBridge(bridge):
|
||||||
@param name: name of the bridge method
|
@param name: name of the bridge method
|
||||||
"""
|
"""
|
||||||
d = super().call(name, *args, **kwargs)
|
d = super().call(name, *args, **kwargs)
|
||||||
|
d.addErrback(self._errback)
|
||||||
return d.asFuture(asyncio.get_event_loop())
|
return d.asFuture(asyncio.get_event_loop())
|
||||||
|
|
||||||
async def bridge_connect(self):
|
async def bridge_connect(self):
|
||||||
|
|
@ -1018,10 +1023,6 @@ class TwistedBridge(bridge):
|
||||||
"""
|
"""
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def _errback(self, failure_):
|
|
||||||
"""Convert Failure to BridgeException"""
|
|
||||||
raise dbus_to_bridge_exception(failure_)
|
|
||||||
|
|
||||||
def call(self, name, *args, **kwargs):
|
def call(self, name, *args, **kwargs):
|
||||||
"""Call a remote method and return a Deferred.
|
"""Call a remote method and return a Deferred.
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue