Author: juhliarik Date: Thu Jul 3 17:20:56 2008 New Revision: 48849 URL: http://svn.opensuse.org/viewcvs/yast?rev=48849&view=rev Log: enabling args for Dear Modified: branches/tmp/lslezak/workshop/scr_dbus/DBus.py branches/tmp/lslezak/workshop/scr_dbus/test.py branches/tmp/lslezak/workshop/scr_dbus/test.ycp branches/tmp/lslezak/workshop/scr_dbus/yast_service.py Modified: branches/tmp/lslezak/workshop/scr_dbus/DBus.py URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/workshop/scr_dbus/DBus.py?rev=48849&r1=48848&r2=48849&view=diff ============================================================================== --- branches/tmp/lslezak/workshop/scr_dbus/DBus.py (original) +++ branches/tmp/lslezak/workshop/scr_dbus/DBus.py Thu Jul 3 17:20:56 2008 @@ -5,28 +5,36 @@ ## this file should be in yast2 module dir (/usr/share/YaST2/modules) ## - +import ycp import dbus ## import function for converting dbus types to classical python types ## it is necessary for python-bindings in yast -import DBusValueToPythonValue +from DBusValueToPythonValue import convertDbusTypeToPythonType bus = dbus.SystemBus() yast_SCR = bus.get_object('org.opensuse.YaST', '/') - -def Read(path): - return DBusValueToPythonValue.convertDbusTypeToPythonType(yast_SCR.Read(path, dbus_interface='org.opensuse.YaST')) - +def Read(path, var): + if var != None: + return convertDbusTypeToPythonType(yast_SCR.Read(path, var, dbus_interface='org.opensuse.YaST')) + else: + return convertDbusTypeToPythonType(yast_SCR.Read(path, 'PyNone', dbus_interface='org.opensuse.YaST')) + def Write(path, value): if value != None: - return DBusValueToPythonValue.convertDbusTypeToPythonType(yast_SCR.Write(path, value, dbus_interface='org.opensuse.YaST')) + return convertDbusTypeToPythonType(yast_SCR.Write(path, value, dbus_interface='org.opensuse.YaST')) else: - return DBusValueToPythonValue.convertDbusTypeToPythonType(yast_SCR.Write(path, 'PyNone', dbus_interface='org.opensuse.YaST')) + return convertDbusTypeToPythonType(yast_SCR.Write(path, 'PyNone', dbus_interface='org.opensuse.YaST')) -def Dir(path): - return DBusValueToPythonValue.convertDbusTypeToPythonType(yast_SCR.Dir(path, dbus_interface='org.opensuse.YaST')) - -def Execute(path): - return DBusValueToPythonValue.convertDbusTypeToPythonType(yast_SCR.Execute(path, dbus_interface='org.opensuse.YaST')) +def Dir(path, var): + if var != None: + return convertDbusTypeToPythonType(yast_SCR.Dir(path, var, dbus_interface='org.opensuse.YaST')) + else: + return convertDbusTypeToPythonType(yast_SCR.Dir(path, 'PyNone', dbus_interface='org.opensuse.YaST')) + +def Execute(path, var): + if var != None: + return convertDbusTypeToPythonType(yast_SCR.Execute(path, var, dbus_interface='org.opensuse.YaST')) + else: + return convertDbusTypeToPythonType(yast_SCR.Execute(path, 'PyNone', dbus_interface='org.opensuse.YaST')) Modified: branches/tmp/lslezak/workshop/scr_dbus/test.py URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/workshop/scr_dbus/test.py?rev=48849&r1=48848&r2=48849&view=diff ============================================================================== --- branches/tmp/lslezak/workshop/scr_dbus/test.py (original) +++ branches/tmp/lslezak/workshop/scr_dbus/test.py Thu Jul 3 17:20:56 2008 @@ -12,14 +12,14 @@ if __name__ == "__main__": - print convertDbusTypeToPythonType(yast_SCR.Dir('.sysconfig.kdump', dbus_interface='org.opensuse.YaST')) + print convertDbusTypeToPythonType(yast_SCR.Dir('.sysconfig.kdump', 'PyNone', dbus_interface='org.opensuse.YaST')) - print convertDbusTypeToPythonType(yast_SCR.Read('.time', dbus_interface='org.opensuse.YaST')) + print convertDbusTypeToPythonType(yast_SCR.Read('.time', {'format' : '+%z'}, dbus_interface='org.opensuse.YaST')) - print convertDbusTypeToPythonType(yast_SCR.Read('.sysconfig.kdump.KDUMP_COMMANDLINE', dbus_interface='org.opensuse.YaST')) + print convertDbusTypeToPythonType(yast_SCR.Read('.sysconfig.kdump.KDUMP_COMMANDLINE', 'PyNone', dbus_interface='org.opensuse.YaST')) print convertDbusTypeToPythonType(yast_SCR.Write('.sysconfig.kdump.KDUMP_COMMANDLINE', 'BLE', dbus_interface='org.opensuse.YaST')) print convertDbusTypeToPythonType(yast_SCR.Write('.sysconfig.kdump', 'PyNone', dbus_interface='org.opensuse.YaST')) - print convertDbusTypeToPythonType(yast_SCR.Read('.sysconfig.kdump.KDUMP_COMMANDLINE', dbus_interface='org.opensuse.YaST')) + print convertDbusTypeToPythonType(yast_SCR.Read('.sysconfig.kdump.KDUMP_COMMANDLINE', 'PyNone', dbus_interface='org.opensuse.YaST')) Modified: branches/tmp/lslezak/workshop/scr_dbus/test.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/workshop/scr_dbus/test.ycp?rev=48849&r1=48848&r2=48849&view=diff ============================================================================== --- branches/tmp/lslezak/workshop/scr_dbus/test.ycp (original) +++ branches/tmp/lslezak/workshop/scr_dbus/test.ycp Thu Jul 3 17:20:56 2008 @@ -3,16 +3,8 @@ import "DBus"; -y2milestone("test for timezone ... %1", DBus::Read(".time")); +y2milestone("test for timezone ... %1", DBus::Read(".time", nil)); -y2milestone("test for reading value KDUMP_COMMANDLINE: %1", DBus::Read(".sysconfig.kdump.KDUMP_COMMANDLINE")); +y2milestone("test for timezone ... %1", DBus::Read(".time",$[ "format" : "+%z" ])); -y2milestone("test for geting all options (without values) from kdump: %1", DBus::Dir(".sysconfig.kdump")); - -y2milestone("change value of KDUMP_COMMANDLINE to \"foo\" %1", DBus::Write(".sysconfig.kdump.KDUMP_COMMANDLINE", "foo")); - -y2milestone("confirm changes in config file (writting) %1", DBus::Write(".sysconfig.kdump", nil)); - -y2milestone("read again value value KDUMP_COMMANDLINE: %1", DBus::Read(".sysconfig.kdump.KDUMP_COMMANDLINE")); - -} \ No newline at end of file +} Modified: branches/tmp/lslezak/workshop/scr_dbus/yast_service.py URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/workshop/scr_dbus/yast_service.py?rev=48849&r1=48848&r2=48849&view=diff ============================================================================== --- branches/tmp/lslezak/workshop/scr_dbus/yast_service.py (original) +++ branches/tmp/lslezak/workshop/scr_dbus/yast_service.py Thu Jul 3 17:20:56 2008 @@ -7,6 +7,7 @@ import dbus import dbus.service import _dbus_bindings +from polkitwrapper import PolkitCheck ## import function for converting dbus types to classical python types ## it is necessary for python-bindings in yast @@ -19,18 +20,23 @@ def __init__(self, object_path): dbus.service.Object.__init__(self, dbus.SystemBus(), object_path="/") - @dbus.service.method(dbus_interface='org.opensuse.YaST', in_signature='s', out_signature='v', sender_keyword='caller') - def Execute(self, path, caller=None): + @dbus.service.method(dbus_interface='org.opensuse.YaST', + in_signature='sv', out_signature='v', sender_keyword='caller') + def Execute(self, path, var, caller=None): my_path = convertDbusTypeToPythonType(path) ycp.SCR.DBusCaller(caller) - ret = ycp.SCR.Execute(ycp.Path(my_path)) + value = convertDbusTypeToPythonType(var) + if value != None: + ret = ycp.SCR.Execute(ycp.Path(my_path), value) + else: + ret = ycp.SCR.Execute(ycp.Path(my_path)) if ret == None: ret = 'PyNone' return ret - - @dbus.service.method(dbus_interface='org.opensuse.YaST', in_signature='sv', out_signature='v', sender_keyword='caller') - def Write (self, path, value, caller=None): + @dbus.service.method(dbus_interface='org.opensuse.YaST', + in_signature='sv', out_signature='v', sender_keyword='caller') + def Write (self, path, value, caller=None): my_path = convertDbusTypeToPythonType(path) ycp.SCR.DBusCaller(caller) ret = ycp.SCR.Write(ycp.Path(my_path), convertDbusTypeToPythonType(value)) @@ -39,20 +45,30 @@ return ret - @dbus.service.method(dbus_interface='org.opensuse.YaST', in_signature='s', out_signature='v', sender_keyword='caller') - def Read(self, path, caller=None): + @dbus.service.method(dbus_interface='org.opensuse.YaST', + in_signature='sv', out_signature='v', sender_keyword='caller') + def Read(self, path, var, caller=None): my_path = convertDbusTypeToPythonType(path) ycp.SCR.DBusCaller(caller) - ret = ycp.SCR.Read(ycp.Path(my_path)) + value = convertDbusTypeToPythonType(var) + if value != None: + ret = ycp.SCR.Read(ycp.Path(my_path), value) + else: + ret = ycp.SCR.Read(ycp.Path(my_path)) if ret == None: ret = 'PyNone' return ret - @dbus.service.method(dbus_interface='org.opensuse.YaST', in_signature='s', out_signature='as', sender_keyword='caller') - def Dir(self, path, caller=None): + @dbus.service.method(dbus_interface='org.opensuse.YaST', + in_signature='sv', out_signature='v', sender_keyword='caller') + def Dir(self, path, var, caller=None): my_path = convertDbusTypeToPythonType(path) ycp.SCR.DBusCaller(caller) - ret = ycp.SCR.Dir(ycp.Path(my_path)) + value = convertDbusTypeToPythonType(var) + if value != None: + ret = ycp.SCR.Dir(ycp.Path(my_path), value) + else: + ret = ycp.SCR.Dir(ycp.Path(my_path)) if ret == None: ret = 'PyNone' return ret -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org