bridge (constructor): fixed D-Bus frontend generator for async method without sig_in + fixed --debug option + regenerated bridge to fix bad frontend D-Bus bridge.
This commit is contained in:
parent
f0b2c7dea3
commit
a2f1522efd
2 changed files with 6 additions and 7 deletions
|
|
@ -180,7 +180,7 @@ class DBusBridgeFrontend(BridgeFrontend):
|
||||||
def getProgress(self, id, profile):
|
def getProgress(self, id, profile):
|
||||||
return self.db_core_iface.getProgress(id, profile)
|
return self.db_core_iface.getProgress(id, profile)
|
||||||
|
|
||||||
def getReady(self, , callback=None, errback=None):
|
def getReady(self, callback=None, errback=None):
|
||||||
return self.db_core_iface.getReady(reply_handler=callback, error_handler=lambda err:errback(err._dbus_error_name[len(const_ERROR_PREFIX)+1:]))
|
return self.db_core_iface.getReady(reply_handler=callback, error_handler=lambda err:errback(err._dbus_error_name[len(const_ERROR_PREFIX)+1:]))
|
||||||
|
|
||||||
def getVersion(self, ):
|
def getVersion(self, ):
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,6 @@ ENV_OVERRIDE = "SAT_BRIDGE_CONST_" # Prefix used to override a constant
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
import os
|
import os
|
||||||
from os import path
|
|
||||||
from optparse import OptionParser
|
from optparse import OptionParser
|
||||||
from ConfigParser import SafeConfigParser as Parser
|
from ConfigParser import SafeConfigParser as Parser
|
||||||
from ConfigParser import NoOptionError
|
from ConfigParser import NoOptionError
|
||||||
|
|
@ -373,7 +372,7 @@ class DbusConstructor(Constructor):
|
||||||
'args': self.getArguments(function['sig_in'], name=arg_doc, default=default)}
|
'args': self.getArguments(function['sig_in'], name=arg_doc, default=default)}
|
||||||
|
|
||||||
if function["type"] == "signal":
|
if function["type"] == "signal":
|
||||||
completion['body'] = "pass" if not self.options.debug else 'debug ("%s")' % section
|
completion['body'] = "pass" if not self.options.debug else 'log.debug ("%s")' % section
|
||||||
signals_part.append("""\
|
signals_part.append("""\
|
||||||
@dbus.service.signal(const_INT_PREFIX+const_%(category)s_SUFFIX,
|
@dbus.service.signal(const_INT_PREFIX+const_%(category)s_SUFFIX,
|
||||||
signature='%(sig_in)s')
|
signature='%(sig_in)s')
|
||||||
|
|
@ -386,7 +385,7 @@ class DbusConstructor(Constructor):
|
||||||
""" % completion)
|
""" % completion)
|
||||||
|
|
||||||
elif function["type"] == "method":
|
elif function["type"] == "method":
|
||||||
completion['debug'] = "" if not self.options.debug else 'debug ("%s")\n%s' % (section, 8 * ' ')
|
completion['debug'] = "" if not self.options.debug else 'log.debug ("%s")\n%s' % (section, 8 * ' ')
|
||||||
completion['args_result'] = self.getArguments(function['sig_in'], name=arg_doc, unicode_protect=self.options.unicode)
|
completion['args_result'] = self.getArguments(function['sig_in'], name=arg_doc, unicode_protect=self.options.unicode)
|
||||||
completion['async_comma'] = ', ' if async and function['sig_in'] else ''
|
completion['async_comma'] = ', ' if async and function['sig_in'] else ''
|
||||||
completion['async_args_def'] = 'callback=None, errback=None' if async else ''
|
completion['async_args_def'] = 'callback=None, errback=None' if async else ''
|
||||||
|
|
@ -447,15 +446,15 @@ class DbusConstructor(Constructor):
|
||||||
'args': self.getArguments(function['sig_in'], name=arg_doc, default=default)}
|
'args': self.getArguments(function['sig_in'], name=arg_doc, default=default)}
|
||||||
|
|
||||||
if function["type"] == "method":
|
if function["type"] == "method":
|
||||||
completion['debug'] = "" if not self.options.debug else 'debug ("%s")\n%s' % (section, 8 * ' ')
|
completion['debug'] = "" if not self.options.debug else 'log.debug ("%s")\n%s' % (section, 8 * ' ')
|
||||||
completion['args_result'] = self.getArguments(function['sig_in'], name=arg_doc)
|
completion['args_result'] = self.getArguments(function['sig_in'], name=arg_doc)
|
||||||
completion['async_args'] = ', callback=None, errback=None' if async else ''
|
completion['async_args'] = 'callback=None, errback=None' if async else ''
|
||||||
completion['async_comma'] = ', ' if async and function['sig_in'] else ''
|
completion['async_comma'] = ', ' if async and function['sig_in'] else ''
|
||||||
completion['async_args_result'] = 'reply_handler=callback, error_handler=lambda err:errback(err._dbus_error_name[len(const_ERROR_PREFIX)+1:])' if async else ''
|
completion['async_args_result'] = 'reply_handler=callback, error_handler=lambda err:errback(err._dbus_error_name[len(const_ERROR_PREFIX)+1:])' if async else ''
|
||||||
result = "self.db_%(category)s_iface.%(name)s(%(args_result)s%(async_comma)s%(async_args_result)s)" % completion
|
result = "self.db_%(category)s_iface.%(name)s(%(args_result)s%(async_comma)s%(async_args_result)s)" % completion
|
||||||
completion['result'] = ("unicode(%s)" if self.options.unicode and function['sig_out'] == 's' else "%s") % result
|
completion['result'] = ("unicode(%s)" if self.options.unicode and function['sig_out'] == 's' else "%s") % result
|
||||||
methods_part.append("""\
|
methods_part.append("""\
|
||||||
def %(name)s(self, %(args)s%(async_args)s):
|
def %(name)s(self, %(args)s%(async_comma)s%(async_args)s):
|
||||||
%(debug)sreturn %(result)s
|
%(debug)sreturn %(result)s
|
||||||
""" % completion)
|
""" % completion)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue