September 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r40927 - in /trunk/metapackage: VERSION package/yast2-metapackage-handler.changes
by mvidner＠svn.opensuse.org 17 Sep '07

17 Sep '07

Author: mvidner Date: Mon Sep 17 08:42:54 2007 New Revision: 40927 URL: http://svn.opensuse.org/viewcvs/yast?rev=40927&view=rev Log: documented last changes Modified: trunk/metapackage/VERSION trunk/metapackage/package/yast2-metapackage-handler.changes Modified: trunk/metapackage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/VERSION?rev=40927&r1… ============================================================================== --- trunk/metapackage/VERSION (original) +++ trunk/metapackage/VERSION Mon Sep 17 08:42:54 2007 @@ -1 +1 @@ -0.7.0 +0.7.1 Modified: trunk/metapackage/package/yast2-metapackage-handler.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/package/yast2-metapa… ============================================================================== --- trunk/metapackage/package/yast2-metapackage-handler.changes (original) +++ trunk/metapackage/package/yast2-metapackage-handler.changes Mon Sep 17 08:42:54 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Sep 17 08:39:14 CEST 2007 - mvidner(a)suse.cz + +- Fixed broken pattern installing and package removal (#FIXME). +- Fixed the close button (#309146). (both benji) +- 0.7.1 + +------------------------------------------------------------------- Tue Sep 4 10:06:32 CEST 2007 - stbinner(a)suse.de - .desktop files have to contain NoDisplay=true, not Hidden=true -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40926 - /trunk/metapackage/src/OneClickInstallWorker.ycp
by benjimanw＠svn.opensuse.org 15 Sep '07

15 Sep '07

Author: benjimanw Date: Sat Sep 15 15:38:15 2007 New Revision: 40926 URL: http://svn.opensuse.org/viewcvs/yast?rev=40926&view=rev Log: Fix broken pattern installing & package removal. Modified: trunk/metapackage/src/OneClickInstallWorker.ycp Modified: trunk/metapackage/src/OneClickInstallWorker.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/src/OneClickInstallW… ============================================================================== --- trunk/metapackage/src/OneClickInstallWorker.ycp (original) +++ trunk/metapackage/src/OneClickInstallWorker.ycp Sat Sep 15 15:38:15 2007 @@ -141,6 +141,7 @@ **/ boolean installPatterns(list<string> patterns) { + Pkg::TargetInit( "/", false ); foreach (string name, patterns, { if (!Pkg::ResolvableInstall(name,`pattern)) @@ -148,7 +149,7 @@ }); boolean state = true; - Pkg::TargetInit( "/", false ); + if(Pkg::PkgSolve(true)) { state = !(Pkg::PkgCommit(0)[0]:-1 < 0); @@ -173,15 +174,14 @@ **/ boolean removePackages(list<string> packages) { + Pkg::TargetInit( "/", false ); boolean result = true; foreach (string name, packages, { - if (Pkg::IsProvided (name)) - result = Pkg::PkgDelete(name); + result = Pkg::PkgDelete(name); }); boolean state = true; - Pkg::TargetInit( "/", false ); if(Pkg::PkgSolve(true)) { state = !(Pkg::PkgCommit(0)[0]:-1 < 0); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40925 - /tags/stable-2_15_21/online-update/
by jsuchome＠svn.opensuse.org 14 Sep '07

14 Sep '07

Author: jsuchome Date: Fri Sep 14 22:11:50 2007 New Revision: 40925 URL: http://svn.opensuse.org/viewcvs/yast?rev=40925&view=rev Log: Created tag stable-2_15_21 for online-update Added: tags/stable-2_15_21/online-update/ - copied from r40924, trunk/online-update/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40924 - in /trunk/online-update: VERSION package/yast2-online-update.changes src/AutoOnlineUpdate.ycp src/OnlineUpdateDialogs.ycp
by jsuchome＠svn.opensuse.org 14 Sep '07

14 Sep '07

Author: jsuchome Date: Fri Sep 14 22:11:34 2007 New Revision: 40924 URL: http://svn.opensuse.org/viewcvs/yast?rev=40924&view=rev Log: - show random time only in Mode::config (#310384) - 2.15.21 Modified: trunk/online-update/VERSION trunk/online-update/package/yast2-online-update.changes trunk/online-update/src/AutoOnlineUpdate.ycp trunk/online-update/src/OnlineUpdateDialogs.ycp Modified: trunk/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/VERSION?rev=40924&… ============================================================================== --- trunk/online-update/VERSION (original) +++ trunk/online-update/VERSION Fri Sep 14 22:11:34 2007 @@ -1 +1 @@ -2.15.20 +2.15.21 Modified: trunk/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/package/yast2-onli… ============================================================================== --- trunk/online-update/package/yast2-online-update.changes (original) +++ trunk/online-update/package/yast2-online-update.changes Fri Sep 14 22:11:34 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Sep 14 21:12:47 CEST 2007 - jsuchome(a)suse.cz + +- show random time only in Mode::config (#310384) +- 2.15.21 + +------------------------------------------------------------------- Fri Aug 10 14:13:51 CEST 2007 - jsuchome(a)suse.cz - fixed typo Modified: trunk/online-update/src/AutoOnlineUpdate.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/AutoOnlineUpda… ============================================================================== --- trunk/online-update/src/AutoOnlineUpdate.ycp (original) +++ trunk/online-update/src/AutoOnlineUpdate.ycp Fri Sep 14 22:11:34 2007 @@ -15,10 +15,11 @@ module "AutoOnlineUpdate"; textdomain "online-update"; +import "FileUtils"; +import "Mode"; import "Package"; import "Report"; import "Summary"; -import "Mode"; /** @@ -123,7 +124,8 @@ global define boolean Read() { - options = (string)SCR::Read( .sysconfig.onlineupdate.CMDLINE_OPTIONS ); + if (FileUtils::Exists ("/etc/sysconfig/onlineupdate")) + options = (string)SCR::Read( .sysconfig.onlineupdate.CMDLINE_OPTIONS ); if (options == nil) options = ""; Modified: trunk/online-update/src/OnlineUpdateDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/OnlineUpdateDi… ============================================================================== --- trunk/online-update/src/OnlineUpdateDialogs.ycp (original) +++ trunk/online-update/src/OnlineUpdateDialogs.ycp Fri Sep 14 22:11:34 2007 @@ -45,7 +45,7 @@ integer day = AutoOnlineUpdate::day; symbol timing = AutoOnlineUpdate::timing; - boolean random_time = AutoOnlineUpdate::random_time; + boolean random_time = AutoOnlineUpdate::random_time && Mode::config (); term head = `VBox( `VSpacing( 0.2 ), @@ -123,16 +123,6 @@ )), `VSpacing( 0.2 ), `VBox( - /* - `HBox( - `HSpacing( 0.8 ), - `Left(`CheckBox( `id( `autoget ), - // checkbox label - _("Only Download Patches"), autoget ) - ), - `HSpacing( 0.8 ) - ), - */ `HBox( `HSpacing( 0.8 ), `Left (`CheckBox( `id( `skipPre), @@ -164,7 +154,6 @@ Label::BackButton(), Label::FinishButton()); -// UI::ChangeWidget( `id( `autoget ), `Enabled, enabled ); UI::ChangeWidget( `id( `skipPre ), `Enabled, enabled ); UI::ChangeWidget( `id( `timing ), `Enabled, enabled ); UI::ChangeWidget( `id( `day ), `Enabled, enabled ); @@ -179,8 +168,8 @@ repeat { enabled = (boolean)UI::QueryWidget( `id( `enable ), `Value ); - enable_days = UI::QueryWidget( `id( `timing - ), `CurrentButton ) == `weekly; + enable_days = + UI::QueryWidget (`id(`timing),`CurrentButton ) == `weekly; if ( ret == `enable ) { @@ -189,9 +178,9 @@ UI::ChangeWidget( `id( `crontime ), `Enabled, enabled ); UI::ChangeWidget( `id( `timing ), `Enabled, enabled ); UI::ChangeWidget( `id( `hour ), `Enabled, enabled && - !AutoOnlineUpdate::random_time); + !random_time); UI::ChangeWidget( `id( `minute ), `Enabled, enabled && - !AutoOnlineUpdate::random_time); + !random_time); UI::ChangeWidget( `id( `day ), `Enabled, enabled && enable_days); if (day != -1) UI::ChangeWidget( `id( `day ), `Value, day ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40923 - /tags/stable-2_15_3/python-bindings/
by juhliarik＠svn.opensuse.org 14 Sep '07

14 Sep '07

Author: juhliarik Date: Fri Sep 14 18:05:17 2007 New Revision: 40923 URL: http://svn.opensuse.org/viewcvs/yast?rev=40923&view=rev Log: Created tag stable-2_15_3 for python-bindings Added: tags/stable-2_15_3/python-bindings/ - copied from r40922, trunk/python-bindings/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40922 - /trunk/python-bindings/VERSION
by juhliarik＠svn.opensuse.org 14 Sep '07

14 Sep '07

Author: juhliarik Date: Fri Sep 14 18:05:04 2007 New Revision: 40922 URL: http://svn.opensuse.org/viewcvs/yast?rev=40922&view=rev Log: new version 2.15.3 Modified: trunk/python-bindings/VERSION Modified: trunk/python-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/VERSION?rev=4092… ============================================================================== --- trunk/python-bindings/VERSION (original) +++ trunk/python-bindings/VERSION Fri Sep 14 18:05:04 2007 @@ -1 +1 @@ -2.15.2 +2.15.3 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40921 - /trunk/python-bindings/package/yast2-python-bindings.changes
by juhliarik＠svn.opensuse.org 14 Sep '07

14 Sep '07

Author: juhliarik Date: Fri Sep 14 18:04:19 2007 New Revision: 40921 URL: http://svn.opensuse.org/viewcvs/yast?rev=40921&view=rev Log: new version 2.15.3 Modified: trunk/python-bindings/package/yast2-python-bindings.changes Modified: trunk/python-bindings/package/yast2-python-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/package/yast2-py… ============================================================================== --- trunk/python-bindings/package/yast2-python-bindings.changes (original) +++ trunk/python-bindings/package/yast2-python-bindings.changes Fri Sep 14 18:04:19 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Sep 9 18:00:33 CEST 2007 - juhliarik(a)suse.cz +- Adding support for calling SCR +- Adding support for ycp types symbol, term, path +- Adding support for calling UI from YaST +- Added patch for bug #308213 and bug# 300909 +- V 2.15.3 + +------------------------------------------------------------------- Fri Aug 10 18:12:33 CEST 2007 - mvidner(a)suse.cz - Finished integrating Feature #120292, UI as a namespace callable -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40920 - in /trunk/python-bindings: doc/python-bindings src/YCP.cc
by juhliarik＠svn.opensuse.org 14 Sep '07

14 Sep '07

Author: juhliarik Date: Fri Sep 14 17:50:30 2007 New Revision: 40920 URL: http://svn.opensuse.org/viewcvs/yast?rev=40920&view=rev Log: added documentation for python-bindings Modified: trunk/python-bindings/doc/python-bindings trunk/python-bindings/src/YCP.cc Modified: trunk/python-bindings/doc/python-bindings URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/doc/python-bindi… ============================================================================== --- trunk/python-bindings/doc/python-bindings (original) +++ trunk/python-bindings/doc/python-bindings Fri Sep 14 17:50:30 2007 @@ -1,12 +1,15 @@ Calling YCP from Python +1. Basic instructions +===================== -YCP module "sum.ycp": +There is simple YCP module (example) +------------------------------------ { -module "sum"; +module "test"; global integer suma(integer a, integer b) { @@ -32,31 +35,86 @@ } -calling from python... +} -general it is called via ycp.run("name_of_module","name_of_function",arg1, arg2...) +Calling this module from python +------------------------------- +Python 2.5.1 (r251:54863, Aug 17 2007, 22:45:43) +[GCC 4.2.1 (SUSE Linux)] on linux2 +Type "help", "copyright", "credits" or "license" for more information. +>>> +>>> import ycp +>>> +>>> ycp.import_module("test") +True +>>> +>>> ycp.test.suma(2,3) +5 +>>> + + +2. How to call UI from YaST in Python +===================================== +- there is important function: ycp.init_ui("qt") +that initialize UI from YaST + +Python 2.5.1 (r251:54863, Aug 17 2007, 22:45:43) +[GCC 4.2.1 (SUSE Linux)] on linux2 +Type "help", "copyright", "credits" or "license" for more information. +>>> >>> import ycp >>> ->>> sum = ycp.run('sum','suma',1,1) ->>> print sum -2 +>>> ycp.init_ui("qt") +True >>> +>>> ycp.import_module("Popup") +True +>>> +>>> ycp.Popup.Message("Example text") +>>> + ->>> list = ycp.run('sum','print_list','string_example',32.5) ->>> print list -['string_example', 32.5] +3. How to call SCR from python +============================== +- there are 4 functions for working with SCR +SCR_Dir, SCR_Read, SCR_Write and SCR_Execute +- first argument of function is ycp path as string +e.g. ".target.bash_output" + +Python 2.5.1 (r251:54863, Aug 17 2007, 22:45:43) +[GCC 4.2.1 (SUSE Linux)] on linux2 +Type "help", "copyright", "credits" or "license" for more information. >>> +>>> import ycp >>> +>>> ycp.SCR_Execute(".target.bash_output","pwd") +{'exit': 0, 'stderr': '', 'stdout': '/home/user\n'} +>>> + + +4. Symbol, Path and Term in python +================================== +- after importing ycp python has 3 classes +for building ycp type such as symbol, path or term + ->>> map = ycp.run('sum','print_map','string_key',685) ->>> print map -{'string_key': 685} >>> +>>> path = Path(".my.path") +>>> + + >>> ->>> print list -['string_example', 32.5] ->>> map = ycp.run('sum','print_map','string_key',list) ->>> print map -{'string_key': ['string_example', 32.5]} +>>> symbol = Symbol("Enabled") +>>> + >>> +>>> term = Term("VBox",Term("Label","&Example Label"), Term("PushButton", "&So What")) +>>> + +5. Calling python module from YCP +================================= +- it works such as standart ycp module +just write "import name_module_without_postfix_py" +and you are able to call only function from python's module +via "name_module_without_postfix_py::name_function(arg1, arg2..)" \ No newline at end of file Modified: trunk/python-bindings/src/YCP.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCP.cc?rev=4… ============================================================================== --- trunk/python-bindings/src/YCP.cc (original) +++ trunk/python-bindings/src/YCP.cc Fri Sep 14 17:50:30 2007 @@ -178,9 +178,34 @@ } +bool RegFunctions(char *NameSpace, YCPList list_functions) { + string nameSpace(NameSpace); + string function; + string python_code; + string postfix("Static"); // here can be random generated string + + python_code = "class " + nameSpace + postfix + ":"; + for (int i=0; i<list_functions.size();i++) { + function = list_functions->value(i)->asString()->value(); + + python_code += "\n\tdef " + function + "(self, *args):"; + python_code += "\n\t\treturn ycp.run(\"" + nameSpace + "\", \"" + function + "\", *args)"; + } + + // registration into ycp module with nameSpace as name + python_code += "\nycp.__dict__['" + nameSpace + "'] = " + nameSpace + postfix + "()"; + + // debug: + //std::cout << "==============================" << std::endl; + //std::cout << python_code << std::endl; + //std::cout << "==============================" << std::endl; + PyRun_SimpleString(python_code.c_str()); + return true; +} +/* bool RegFunctions(char *NameSpace, YCPList list_functions) { @@ -214,6 +239,7 @@ return true; } +*/ Y2Component *owned_wfmc = 0; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40919 - in /trunk/python-bindings: src/YCP.cc src/YPython.cc src/YPython.h yast2-python-bindings.spec.in
by juhliarik＠svn.opensuse.org 14 Sep '07

14 Sep '07

Author: juhliarik Date: Fri Sep 14 17:09:08 2007 New Revision: 40919 URL: http://svn.opensuse.org/viewcvs/yast?rev=40919&view=rev Log: added term into python bindings Modified: trunk/python-bindings/src/YCP.cc trunk/python-bindings/src/YPython.cc trunk/python-bindings/src/YPython.h trunk/python-bindings/yast2-python-bindings.spec.in Modified: trunk/python-bindings/src/YCP.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCP.cc?rev=4… ============================================================================== --- trunk/python-bindings/src/YCP.cc (original) +++ trunk/python-bindings/src/YCP.cc Fri Sep 14 17:09:08 2007 @@ -18,6 +18,7 @@ #include <ycp/YCPMap.h> #include <ycp/YCPList.h> #include <ycp/YCPPath.h> +#include <ycp/YCPTerm.h> #include <ycp/YCPString.h> #include <ycp/SymbolTable.h> @@ -126,9 +127,40 @@ char func_code[] = "def _factory(module, name):\n\ - def FunctionCall(*args):\n\ - return ycp.run(module, name, *args)\n\ - return FunctionCall"; + def FunctionCall(*args):\n\ + return ycp.run(module, name, *args)\n\ + return FunctionCall"; + + char class_type_code[] = + "class YCPType:\n\ + def __init__(self, value=''):\n\ + self.type = \"any\"\n\ + self.value = value\n\ + def identity(self):\n\ + return self.type"; + + char class_symbol_type_code[] = + "class Symbol(YCPType):\n\ + def __init__(self, value):\n\ + self.type = \"symbol\"\n\ + self.value = value"; + + char class_path_type_code[] = + "class Path(YCPType):\n\ + def __init__(self, value):\n\ + self.type = \"path\"\n\ + self.value = value"; + + + char class_term_type_code[] = + "class Term(YCPType):\n\ + def __init__(self, name, *args):\n\ + self.type = \"term\"\n\ + self.name = name\n\ + self.value = args"; + + + (void) Py_InitModule("ycp", YCPMethods); @@ -136,6 +168,13 @@ PyRun_SimpleString(func_code); + PyRun_SimpleString(class_type_code); + + PyRun_SimpleString(class_symbol_type_code); + + PyRun_SimpleString(class_path_type_code); + + PyRun_SimpleString(class_term_type_code); } @@ -307,15 +346,10 @@ YPython *ypython = YPython::yPython (); char *temp; temp = (char *) malloc(20); - //printf("Test 1. %s\n",scr_command); - temp = strcpy(temp, scr_command); - //printf("Test 1.01. %s\n",temp); - declaration_t *bi_dt = static_declarations.findDeclaration(temp); - //printf("Test 1.1.\n"); if (bi_dt == NULL) { y2error ("No such builtin '%s'", scr_command); @@ -329,7 +363,7 @@ return PyExc_SyntaxError; } - //printf("Test 2.\n"); + for (int i=0; i< number_args; i++) { pPythonValue = PyTuple_GetItem(args, i); if (pPythonValue) { @@ -358,7 +392,7 @@ } } - //printf("Test 3.\n"); + if (ycpArg.isNull ()) { // an error has already been reported, now refine it. // Can't know parameter name? @@ -381,7 +415,6 @@ // Returns NULL if OK, Type::Error if excessive argument // Other errors (bad code, bad type) shouldn't happen - //printf("Test 4.\n"); constTypePtr err_tp = bi_call->attachParameter (param_c, act_param_tp); if (err_tp != NULL) { if (err_tp->isError ()) { @@ -403,7 +436,6 @@ } } - //printf("Test 5.\n"); // now must check if we got fewer parameters than needed // or there was another error while resolving the overload @@ -537,9 +569,13 @@ pPythonValue = PyTuple_GetItem(args, i); if (pPythonValue) { if (!(ypython->PythonTypeToYCPSimpleType(pPythonValue,ycpArg))) { - ycpArg = ypython->fromPythonListToYCPList (pPythonValue); + ycpArg = ypython->fromPythonListToYCPList(pPythonValue); + if (ycpArg.isNull()) + ycpArg = ypython->fromPythonDictToYCPMap(pPythonValue); + if (ycpArg.isNull()) + ycpArg = ypython->fromPythonTupleToYCPList(pPythonValue); if (ycpArg.isNull()) - ycpArg = ypython->fromPythonDictToYCPMap (pPythonValue); + ycpArg = ypython->fromPythonTermToYCPTerm(pPythonValue); } if (fun_type->parameterType(i-2)->matchvalue(ycpArg) != 0) { y2error ("Wrong type of argumment %d",i-2); @@ -578,8 +614,14 @@ pReturnValue = ypython->YCPTypeToPythonSimpleType(ycpRetValue); if (!pReturnValue) pReturnValue = ypython->fromYCPListToPythonList(ycpRetValue); + if (!pReturnValue) + pReturnValue = ypython->fromYCPListToPythonTuple(ycpRetValue); if (!pReturnValue) pReturnValue = ypython->fromYCPMapToPythonDict(ycpRetValue); + if (!pReturnValue) + pReturnValue = ypython->fromYCPTermToPythonTerm(ycpRetValue); + + return pReturnValue; } else { Modified: trunk/python-bindings/src/YPython.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YPython.cc?r… ============================================================================== --- trunk/python-bindings/src/YPython.cc (original) +++ trunk/python-bindings/src/YPython.cc Fri Sep 14 17:09:08 2007 @@ -49,15 +49,27 @@ #include <ycp/YCPExternal.h> YPython * YPython::_yPython = 0; -YPython::YPython() -{ - +YPython::YPython() { + + PyObject* pMain; + PyObject* pYCP; + PyObject* pMainDict; + pMain = PyImport_AddModule("__main__"); + pYCP = PyImport_AddModule("ycp"); + pMainDict = PyModule_GetDict(pMain); + pPathClass = PyDict_GetItemString(pMainDict, "Path"); + pSymbolClass = PyDict_GetItemString(pMainDict, "Symbol"); + pTermClass = PyDict_GetItemString(pMainDict, "Term"); + } -YPython::~YPython() -{ - +YPython::~YPython() { + + Py_CLEAR(pPathClass); + Py_CLEAR(pSymbolClass); + Py_CLEAR(pTermClass); + } @@ -145,9 +157,15 @@ if (!pArg) pArg = fromYCPListToPythonList(argList->value(i)); + + if (!pArg) + pArg = fromYCPListToPythonTuple(argList->value(i)); + if (!pArg) pArg = fromYCPMapToPythonDict(argList->value(i)); - + if (!pArg) + pArg = fromYCPTermToPythonTerm(argList->value(i)); + PyTuple_SetItem(pArgs,i-1, pArg); } @@ -161,13 +179,19 @@ if (pReturn) { //result = YCPInteger(PyInt_AsLong(pReturn)); //new YCPValue(); - + if (!PythonTypeToYCPSimpleType(pReturn, result)) + result = fromPythonTupleToYCPList(pReturn); + + if (result.isNull()) result = fromPythonListToYCPList (pReturn); if (result.isNull()) result = fromPythonDictToYCPMap (pReturn); + if (result.isNull()) + result = fromPythonTermToYCPTerm(pReturn); + } Py_CLEAR(pReturn); @@ -186,7 +210,7 @@ * transfered are: boolean, integer, string, float, **/ bool YPython::PythonTypeToYCPSimpleType(PyObject* pPythonValue, YCPValue &out) { - + PyObject * value; // boolean value handling if (PyBool_Check(pPythonValue)) { PyObject * true_value = PyBool_FromLong(1); @@ -198,7 +222,7 @@ } else { return false; } - return true; + return true; } //integer value handling @@ -227,6 +251,24 @@ return true; } + if (PyInstance_Check(pPythonValue)) { + if (PyObject_HasAttrString(pPythonValue, "type")) { + PyObject * py_attr = PyObject_GetAttrString(pPythonValue,"type"); + if (PyString_Check(py_attr)) { + string type = PyString_AsString(py_attr); + if (type.compare("symbol") == 0) { + value = PyObject_GetAttrString(pPythonValue,"value"); + out = YCPSymbol(PyString_AsString(value)); + return true; + } + if (type.compare("path") == 0) { + value = PyObject_GetAttrString(pPythonValue,"value"); + out = YCPPath(PyString_AsString(value)); + return true; + } + } //end of if (PyString_Check(py_attr)) + } //end of if (PyObject_HasAttrString(pPythonValue, "type")) + } return false; } @@ -258,21 +300,40 @@ } else if (in->isVoid()) { return Py_None; - } else if (in->isVoid()) { - return Py_None; + } else if (in->isPath()) { + if (pPathClass) { + PyObject *value = PyString_FromString(in->asPath()->toString().c_str()); + PyObject *pyArgs = PyTuple_New(1); + PyTuple_SetItem(pyArgs, 0, value); + return PyInstance_New(pPathClass, pyArgs, NULL); + + } else { + return Py_None; + } + } else if (in->isSymbol()) { + if (pSymbolClass) { + //add hack delete first char (`) from output + PyObject *value = PyString_FromString(in->asSymbol()->toString().erase(0,1).c_str()); + PyObject *pyArgs = PyTuple_New(1); + PyTuple_SetItem(pyArgs, 0, value); + return PyInstance_New(pSymbolClass, pyArgs, NULL); + } else { + return Py_None; + } } else return NULL; } - /** - * Convert a Python list to a YCPList. - **/ +/** + * Convert a Python list to a YCPList. +**/ + YCPList YPython::fromPythonListToYCPList (PyObject* pPythonList) { YCPList ycp_List; PyObject * pItem; YCPValue ycp_value; - //TODO add checking for list (is it really list?) + //checking for list (is it really list?) if (PyList_Check(pPythonList) > 0) { int list_size = PyList_Size(pPythonList); for (int i = 0; i < list_size; i++) { @@ -284,7 +345,18 @@ return YCPNull (); } } else { //end of if (PythonTypeToYCPSimpleType(item, ycp_value)) - return YCPNull (); + ycp_value = fromPythonListToYCPList(pItem); + if (ycp_value.isNull ()) + ycp_value = fromPythonDictToYCPMap (pItem); + if (ycp_value.isNull ()) + ycp_value = fromPythonTupleToYCPList(pItem); + if (ycp_value.isNull ()) + ycp_value = fromPythonTermToYCPTerm(pItem); + + if (!ycp_value.isNull ()) + ycp_List->add(ycp_value); + else + return YCPNull (); } // end of else for if (PythonTypeToYCPSimpleType(item, ycp_value)) } //end of for (int i = 0; i < list_size; i++) } else { //end if (PyList_Check(pPythonList) > 0) @@ -294,10 +366,54 @@ return ycp_List; } - - /** - * Convert a YCPList to a Python list. - **/ + +/** + * Convert a Python Tuple to a YCPList. + **/ +YCPList YPython::fromPythonTupleToYCPList (PyObject* pPythonTuple) { + YCPList ycp_List; + PyObject * pItem; + YCPValue ycp_value; + //checking for list (is it really list?) + if (PyTuple_Check(pPythonTuple) > 0) { + int list_size = PyTuple_Size(pPythonTuple); + for (int i = 0; i < list_size; i++) { + pItem = PyTuple_GetItem(pPythonTuple, i); + if (PythonTypeToYCPSimpleType(pItem, ycp_value)) { + if (!ycp_value.isNull ()) { + ycp_List->add(ycp_value); + } else { + return YCPNull (); + } + } else { //end of if (PythonTypeToYCPSimpleType(item, ycp_value)) + ycp_value = fromPythonListToYCPList(pItem); + + if (ycp_value.isNull ()) + ycp_value = fromPythonTupleToYCPList(pItem); + + if (ycp_value.isNull ()) + ycp_value = fromPythonDictToYCPMap(pItem); + + if (ycp_value.isNull ()) + ycp_value = fromPythonTermToYCPTerm(pItem); + + if (!ycp_value.isNull ()) + ycp_List->add(ycp_value); + else + return YCPNull (); + } // end of else for if (PythonTypeToYCPSimpleType(item, ycp_value)) + } //end of for (int i = 0; i < list_size; i++) + } else { //end if (PyTuple_Check(pPythonList) > 0) + y2milestone ("Value is not Python Tuple"); + return YCPNull (); + } //end else of if (PyTuple_Check(pPythonList) > 0) + + return ycp_List; +} + +/** + * Convert a YCPList to a Python list. + **/ PyObject* YPython::fromYCPListToPythonList (YCPValue ycp_List) { PyObject* pPythonList; @@ -308,11 +424,24 @@ pPythonList = PyList_New(ycp_List->asList()->size()); else { y2error("YCP list is empty."); - return NULL; + return Py_None; } y2milestone ("Size of list %d",ycp_List->asList()->size()); for ( int i = 0; i < ycp_List->asList()->size(); i++ ) { pItem = YCPTypeToPythonSimpleType(ycp_List->asList()->value(i)); + + if (!pItem) + pItem = fromYCPListToPythonList(ycp_List->asList()->value(i)); + + if (!pItem) + pItem = fromYCPListToPythonTuple(ycp_List->asList()->value(i)); + + if (!pItem) + pItem = fromYCPMapToPythonDict(ycp_List->asList()->value(i)); + + if (!pItem) + pItem = fromYCPTermToPythonTerm(ycp_List->asList()->value(i)); + ret = PyList_SetItem(pPythonList, i, pItem); if (ret <0) @@ -328,10 +457,56 @@ } } +/** + * Convert a YCPList to a Python tuple. + **/ +PyObject* YPython::fromYCPListToPythonTuple (YCPValue ycp_List) { + + PyObject* pPythonTuple; + PyObject* pItem; + int ret = 0; + if (ycp_List->isList()) { + if (ycp_List->asList()->size()>0) + pPythonTuple = PyTuple_New(ycp_List->asList()->size()); + else { + y2error("YCP list is empty."); + return Py_None; + } + y2milestone ("Size of list %d",ycp_List->asList()->size()); + for ( int i = 0; i < ycp_List->asList()->size(); i++ ) { + pItem = YCPTypeToPythonSimpleType(ycp_List->asList()->value(i)); + + if (!pItem) + pItem = fromYCPListToPythonList(ycp_List->asList()->value(i)); + + if (!pItem) + pItem = fromYCPListToPythonTuple(ycp_List->asList()->value(i)); + + if (!pItem) + pItem = fromYCPMapToPythonDict(ycp_List->asList()->value(i)); + + if (!pItem) + pItem = fromYCPTermToPythonTerm(ycp_List->asList()->value(i)); + + ret = PyTuple_SetItem(pPythonTuple, i, pItem); - /** - * Convert a YCPMap to a Python Dictionary. - **/ + if (ret <0) + y2error("PyList_SetItem doesn't add item into python list."); + + } + Py_INCREF(pPythonTuple); + return pPythonTuple; + + } else { + y2milestone ("Value is not YCPList"); + return NULL; + } +} + + +/** + * Convert a YCPMap to a Python Dictionary. + **/ PyObject* YPython::fromYCPMapToPythonDict (YCPValue ycp_Map) { PyObject* pPythonDict; @@ -350,8 +525,14 @@ pValue = YCPTypeToPythonSimpleType(it.value()); if (!pValue) pValue = fromYCPListToPythonList(it.value()); + if (!pValue) + pValue = fromYCPListToPythonTuple(it.value()); if (!pValue) pValue = fromYCPMapToPythonDict(it.value()); + if (!pValue) + pValue = fromYCPTermToPythonTerm(it.value()); + + if (pValue) { ret = PyDict_SetItem(pPythonDict, pKey, pValue); if (ret < 0) { @@ -379,11 +560,11 @@ } - /** - * Convert a Python Dictionary to a YCPMap. - **/ +/** + * Convert a Python Dictionary to a YCPMap. + **/ YCPMap YPython::fromPythonDictToYCPMap (PyObject* pPythonDict) { - + PyObject* pListKeys; PyObject* pListValues; YCPValue ycp_key; @@ -400,7 +581,12 @@ } else { ycp_value = fromPythonListToYCPList(PyList_GetItem(pListValues, i)); if (ycp_value.isNull ()) - ycp_value =fromPythonDictToYCPMap (PyList_GetItem(pListValues, i)); + ycp_value = fromPythonTupleToYCPList(PyList_GetItem(pListValues, i)); + if (ycp_value.isNull ()) + ycp_value = fromPythonDictToYCPMap (PyList_GetItem(pListValues, i)); + if (ycp_value.isNull ()) + ycp_value = fromPythonTermToYCPTerm(PyList_GetItem(pListValues, i)); + ycp_Map->add (ycp_key, ycp_value); } @@ -421,11 +607,97 @@ return ycp_Map; } +/** + * Convert a Python Term to a YCPTerm. + **/ +YCPTerm YPython::fromPythonTermToYCPTerm (PyObject* pPythonTerm) { + PyObject *value; + PyObject *pyName; + string name; + YCPValue ycp_value; + if (PyInstance_Check(pPythonTerm)) { + if (PyObject_HasAttrString(pPythonTerm, "type")) { + PyObject * py_attr = PyObject_GetAttrString(pPythonTerm,"type"); + if (PyString_Check(py_attr)) { + string type = PyString_AsString(py_attr); + if (type.compare("term") == 0) { + pyName = PyObject_GetAttrString(pPythonTerm,"name"); + if (PyString_Check(pyName)) { + name = PyString_AsString(pyName); + value = PyObject_GetAttrString(pPythonTerm,"value"); + if (PyTuple_Check(value)) + + ycp_value = fromPythonTupleToYCPList(value); + + if (!ycp_value.isNull ()) { + //printf("term is: %s\n",YCPTerm(name,ycp_value->asList())->toString().c_str()); + return YCPTerm(name,ycp_value->asList()); + + } else { + y2error("Value was not converted to YCPTerm"); + return YCPNull (); + } + } else { + y2error ("The name of Term is not string"); + return YCPNull (); + } + } else { + y2milestone ("Value is not python Term"); + return YCPNull (); + } + } else { + y2error ("Value is not any python class for ycp types"); + return YCPNull (); + } + } + } else { + return YCPNull (); + } + return YCPNull (); +} +/** + * Convert a YCPTerm to a Python Term. + **/ +PyObject* YPython::fromYCPTermToPythonTerm (YCPValue ycp_Term) { + PyObject* pPythonTerm; + PyObject* pName; + PyObject* pValue; + if (ycp_Term->isTerm()) { + if (ycp_Term->asTerm()->args()->size()>0) { + pName = PyString_FromString(ycp_Term->asTerm()->name().c_str()); + YCPValue list = ycp_Term->asTerm()->args(); + pValue = fromYCPListToPythonTuple(list); + if (pValue) { + if (pTermClass) { + PyObject *pyArgs = PyTuple_New(2); + PyTuple_SetItem(pyArgs, 0, pName); + PyTuple_SetItem(pyArgs, 1, pValue); + pPythonTerm = PyInstance_New(pTermClass, pyArgs, NULL); + } else { + y2error("There is missing Term class in python"); + return Py_None; + } + } else { + y2error("Converting to python tuple failed"); + return Py_None; + } + + } else { // end if (ycp_Map->asMap()->size()>0) + y2error("YCP term is empty."); + return NULL; + } // end else of if (ycp_Map->asMap()->size()>0) + } else { // end if (ycp_Map->isMap()) + y2milestone ("Value is not YCPTerm"); + return NULL; + } // end else of if (ycp_Map->isMap()) + Py_INCREF(pPythonTerm); + return pPythonTerm; +} Modified: trunk/python-bindings/src/YPython.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YPython.h?re… ============================================================================== --- trunk/python-bindings/src/YPython.h (original) +++ trunk/python-bindings/src/YPython.h Fri Sep 14 17:09:08 2007 @@ -96,6 +96,30 @@ **/ PyObject* fromYCPMapToPythonDict (YCPValue ycp_Map); + /** + * Convert a Python Tuple to YCPList + **/ + YCPList fromPythonTupleToYCPList (PyObject* pPythonTuple); + + /** + * Convert a YCPList to a Python tuple. + **/ + PyObject* fromYCPListToPythonTuple (YCPValue ycp_List); + + /** + * Convert a Python Tuple to YCPList + **/ + YCPTerm fromPythonTermToYCPTerm (PyObject* pPythonTerm); + + /** + * Convert a YCPList to a Python tuple. + **/ + PyObject* fromYCPTermToPythonTerm (YCPValue ycp_Term); + + + PyObject *pPathClass; + PyObject *pSymbolClass; + PyObject *pTermClass; protected: @@ -111,8 +135,7 @@ **/ ~YPython(); - - + }; Modified: trunk/python-bindings/yast2-python-bindings.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/yast2-python-bin… ============================================================================== --- trunk/python-bindings/yast2-python-bindings.spec.in (original) +++ trunk/python-bindings/yast2-python-bindings.spec.in Fri Sep 14 17:09:08 2007 @@ -32,6 +32,6 @@ # libYCP goes elsewhere -%dir %{_libdir}/python +# %dir %{_libdir}/python %{_libdir}/python/site-packages %doc @docdir@ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40918 - /tags/stable-2_15_9/live-installer/
by locilka＠svn.opensuse.org 14 Sep '07

14 Sep '07

Author: locilka Date: Fri Sep 14 14:48:36 2007 New Revision: 40918 URL: http://svn.opensuse.org/viewcvs/yast?rev=40918&view=rev Log: Created tag stable-2_15_9 for live-installer Added: tags/stable-2_15_9/live-installer/ - copied from r40917, trunk/live-installer/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0