September 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41107 - in /branches/tmp/sh/mod-ui/ncurses/src: NCAskForDirectory.cc NCtext.cc YNCursesUI.cc
by sh-sh-sh＠svn.opensuse.org 26 Sep '07

26 Sep '07

Author: sh-sh-sh Date: Wed Sep 26 14:04:40 2007 New Revision: 41107 URL: http://svn.opensuse.org/viewcvs/yast?rev=41107&view=rev Log: fixed dir selector Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc branches/tmp/sh/mod-ui/ncurses/src/NCtext.cc branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCA… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc Wed Sep 26 14:04:40 2007 @@ -104,12 +104,10 @@ opt.notifyMode.setValue( false ); // the headline - new NCLabel( split, headline->toString(), true, false ); // isHeading = true + new NCLabel( split, headline->value(), true, false ); // isHeading = true new NCSpacing( split, YD_VERT, false, 0.4 ); - opt.isHStretchable.setValue( true ); // see hSplit - NCFrame * frame = new NCFrame( split, "" ); //NCLayoutBox * vSplit = new NCLayoutBox( frame, YD_VERT ); @@ -119,6 +117,7 @@ // label for text field showing the selected dir dirName = new NCComboBox( frame, _( "Selected Directory:" ), false ); // editable = false dirName->setNotify( true ); + dirName->setStretchable( YD_HORIZ, true ); YStringWidgetID * dirID = new YStringWidgetID( idDirName ); dirName->setId( dirID ); Modified: branches/tmp/sh/mod-ui/ncurses/src/NCtext.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCt… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCtext.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCtext.cc Wed Sep 26 14:04:40 2007 @@ -322,7 +322,7 @@ w.move( l, area.Pos.C + pre ); } - NCDBG << "TERMINAL: " << NCstring::terminalEncoding() << " CODESET: " << nl_langinfo( CODESET) << endl; + // NCDBG << "TERMINAL: " << NCstring::terminalEncoding() << " CODESET: " << nl_langinfo( CODESET) << endl; if ( len ) { if ( NCstring::terminalEncoding() != "UTF-8" ) Modified: branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/YNC… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc Wed Sep 26 14:04:40 2007 @@ -949,9 +949,11 @@ const YCPString & filter, const YCPString & headline ) { - NCAskForExistingFile filePopup( wpos( 1, 1 ), startDir, filter, headline ); + NCAskForExistingFile * filePopup = new NCAskForExistingFile( wpos( 1, 1 ), startDir, filter, headline ); + YUI_CHECK_NEW( filePopup ); - NCursesEvent retEvent = filePopup.showDirPopup( ); + NCursesEvent retEvent = filePopup->showDirPopup( ); + YDialog::deleteTopmostDialog(); if ( !retEvent.result.isNull() ) { @@ -973,9 +975,11 @@ YCPValue YNCursesUI::askForExistingDirectory( const YCPString & startDir, const YCPString & headline ) { - NCAskForExistingDirectory dirPopup( wpos( 1, 1 ), startDir, headline ); + NCAskForExistingDirectory * dirPopup = new NCAskForExistingDirectory( wpos( 1, 1 ), startDir, headline ); + YUI_CHECK_NEW( dirPopup ); - NCursesEvent retEvent = dirPopup.showDirPopup( ); + NCursesEvent retEvent = dirPopup->showDirPopup( ); + YDialog::deleteTopmostDialog(); if ( !retEvent.result.isNull() ) { -- 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] r41106 - in /branches/tmp/sh/mod-ui/ncurses/src: NCSpacing.cc NCSpacing.h
by gs＠svn.opensuse.org 26 Sep '07

26 Sep '07

Author: gs Date: Wed Sep 26 13:06:10 2007 New Revision: 41106 URL: http://svn.opensuse.org/viewcvs/yast?rev=41106&view=rev Log: correct params Modified: branches/tmp/sh/mod-ui/ncurses/src/NCSpacing.cc branches/tmp/sh/mod-ui/ncurses/src/NCSpacing.h Modified: branches/tmp/sh/mod-ui/ncurses/src/NCSpacing.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCS… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCSpacing.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCSpacing.cc Wed Sep 26 13:06:10 2007 @@ -32,7 +32,7 @@ YUIDimension dim, bool stretchable, YLayoutSize_t layoutUnits ) - : YSpacing( parent, dim, stretchable ) + : YSpacing( parent, dim, stretchable, layoutUnits ) , NCWidget( parent ) { WIDDBG << endl; @@ -85,6 +85,7 @@ // void NCSpacing::setSize( int newwidth, int newheight ) { + NCMIL << "setSize called w: " << newwidth << " h: " << newheight << endl; wRelocate( wpos( 0 ), wsze( newheight, newwidth ) ); } Modified: branches/tmp/sh/mod-ui/ncurses/src/NCSpacing.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCS… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCSpacing.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCSpacing.h Wed Sep 26 13:06:10 2007 @@ -50,7 +50,7 @@ public: NCSpacing( YWidget * parent, YUIDimension dim, - bool stretchable, YLayoutSize_t layoutUnits ); + bool stretchable = false, YLayoutSize_t layoutUnits = 0.0 ); virtual ~NCSpacing(); -- 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] r41105 - in /trunk/storage: agents-scr/Makefile.am agents-scr/cfg_storage.scr data/sysconfig.storage disk/src/disk.ycp package/yast2-storage.changes
by fehr＠svn.opensuse.org 26 Sep '07

26 Sep '07

Author: fehr Date: Wed Sep 26 12:46:29 2007 New Revision: 41105 URL: http://svn.opensuse.org/viewcvs/yast?rev=41105&view=rev Log: make warning at start of yast2 disk suppressible Added: trunk/storage/agents-scr/cfg_storage.scr Modified: trunk/storage/agents-scr/Makefile.am trunk/storage/data/sysconfig.storage trunk/storage/disk/src/disk.ycp trunk/storage/package/yast2-storage.changes Modified: trunk/storage/agents-scr/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/agents-scr/Makefile.am?r… ============================================================================== --- trunk/storage/agents-scr/Makefile.am (original) +++ trunk/storage/agents-scr/Makefile.am Wed Sep 26 12:46:29 2007 @@ -9,6 +9,7 @@ proc_partitions.scr \ dasddev.scr \ etc_mtab.scr \ + cfg_storage.scr \ run_swapon_s.scr EXTRA_DIST = $(scrconf_DATA) Added: trunk/storage/agents-scr/cfg_storage.scr URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/agents-scr/cfg_storage.s… ============================================================================== --- trunk/storage/agents-scr/cfg_storage.scr (added) +++ trunk/storage/agents-scr/cfg_storage.scr Wed Sep 26 12:46:29 2007 @@ -0,0 +1,21 @@ +/** + * File: + * cfg_storage.scr + * Summary: + * SCR Agent for reading/writing /etc/sysconfig/storage + * using the rc-agent + * Access: + * read/write + * Authors: + * Thomas Fehr <fehr(a)suse.cz> + * + * $Id: cfg_sound.scr 13018 2003-12-11 12:52:53Z jhumpol $ + * + * Read/Sets the values defined in <tt>/etc/sysconfig/storage</tt> + * in an easy manner. + */ +.sysconfig.storage + +`ag_ini( + `SysConfigFile("/etc/sysconfig/storage") +) Modified: trunk/storage/data/sysconfig.storage URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/data/sysconfig.storage?r… ============================================================================== --- trunk/storage/data/sysconfig.storage (original) +++ trunk/storage/data/sysconfig.storage Wed Sep 26 12:46:29 2007 @@ -11,3 +11,7 @@ ## Type: string(id,path,device,uuid,label) # List of possible default mount-by methods DEVICE_NAMES="id" + +## Type: integer(0:1) +# Show warning at start of yast2 disk +WARN_EXPERT="1" Modified: trunk/storage/disk/src/disk.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/disk/src/disk.ycp?rev=41… ============================================================================== --- trunk/storage/disk/src/disk.ycp (original) +++ trunk/storage/disk/src/disk.ycp Wed Sep 26 12:46:29 2007 @@ -27,6 +27,7 @@ import "Popup"; import "Wizard"; + import "Misc"; string msg=_("Only use this program if you are familiar with partitioning hard disks. @@ -54,7 +55,11 @@ ret = `back; // popup headline - if (Popup::YesNoHeadline(_("Warning"),msg)==true) { + integer warn = tointeger(Misc::SysconfigRead( .sysconfig.storage.WARN_EXPERT, "1" )); + y2milestone( "warn:%1", warn ); + if( warn==nil ) + warn = 1; + if (warn==0||Popup::YesNoHeadline(_("Warning"),msg)==true) { y2milestone ("--- Calling disk_worker %1 ---", WFM::Args()); ret = WFM::call("disk_worker", WFM::Args()); y2milestone ("--- Returned: %1 ---", ret); Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Wed Sep 26 12:46:29 2007 @@ -3,6 +3,7 @@ - allow also device, uuid and label as default mount-by in /etc/sysconfig/storage +- make warning at start of yast2 disk suppressible - version 2.16.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] r41104 - in /trunk/storage: data/sysconfig.storage libstorage/src/Storage.cc package/yast2-storage.changes
by fehr＠svn.opensuse.org 26 Sep '07

26 Sep '07

Author: fehr Date: Wed Sep 26 12:01:27 2007 New Revision: 41104 URL: http://svn.opensuse.org/viewcvs/yast?rev=41104&view=rev Log: allow also device, uuid and label as default mount-by in /etc/sysconfig/storage Modified: trunk/storage/data/sysconfig.storage trunk/storage/libstorage/src/Storage.cc trunk/storage/package/yast2-storage.changes Modified: trunk/storage/data/sysconfig.storage URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/data/sysconfig.storage?r… ============================================================================== --- trunk/storage/data/sysconfig.storage (original) +++ trunk/storage/data/sysconfig.storage Wed Sep 26 12:01:27 2007 @@ -7,3 +7,7 @@ ## Type: string # List of used filesystem types. USED_FS_LIST="" + +## Type: string(id,path,device,uuid,label) +# List of possible default mount-by methods +DEVICE_NAMES="id" Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Wed Sep 26 12:01:27 2007 @@ -166,6 +166,12 @@ setDefaultMountBy( MOUNTBY_ID ); else if( val == "path" ) setDefaultMountBy( MOUNTBY_PATH ); + else if( val == "device" ) + setDefaultMountBy( MOUNTBY_DEVICE ); + else if( val == "uuid" ) + setDefaultMountBy( MOUNTBY_UUID ); + else if( val == "label" ) + setDefaultMountBy( MOUNTBY_LABEL ); } } } Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Wed Sep 26 12:01:27 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Sep 26 12:00:06 CEST 2007 - fehr(a)suse.de + +- allow also device, uuid and label as default mount-by in + /etc/sysconfig/storage +- version 2.16.0 + +------------------------------------------------------------------- Mon Sep 24 13:00:18 CEST 2007 - fehr(a)suse.de - prevent crash with invalid dmraid data (#327342) -- 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] r41103 - in /trunk/python-bindings: VERSION src/YCP.cc src/YPython.cc src/YPythonNamespace.cc
by juhliarik＠svn.opensuse.org 26 Sep '07

26 Sep '07

Author: juhliarik Date: Wed Sep 26 11:39:15 2007 New Revision: 41103 URL: http://svn.opensuse.org/viewcvs/yast?rev=41103&view=rev Log: new version of python-bindings -added logging -added type classes into ycp module (before were global) -added correction for importing namespace (import modules written in ycp) Modified: trunk/python-bindings/VERSION trunk/python-bindings/src/YCP.cc trunk/python-bindings/src/YPython.cc trunk/python-bindings/src/YPythonNamespace.cc Modified: trunk/python-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/VERSION?rev=4110… ============================================================================== --- trunk/python-bindings/VERSION (original) +++ trunk/python-bindings/VERSION Wed Sep 26 11:39:15 2007 @@ -1 +1 @@ -2.15.3 +2.16.0 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 Wed Sep 26 11:39:15 2007 @@ -1,6 +1,5 @@ /** * - * * This is the path from Python to YCP. It defines XSUBs. */ @@ -25,8 +24,12 @@ #include "YPython.h" #include "PythonLogger.h" +/** + * Store pointer to ycp module itself. + */ +static PyObject *Self; -YCPList ycp_ListFunctions; +YCPList * ycp_ListFunctions; PyObject * Call_YCPFunction (PyObject *args); @@ -36,10 +39,13 @@ PyObject * SCR_Run (const char *scr_command, PyObject *args); +void Py_y2logger(PyObject *args); + void init_wfm (); static bool HandleSymbolTable (const SymbolEntry & se) { + if (se.isFunction ()) { ycp_ListFunctions->add(YCPString(se.name())); @@ -111,6 +117,20 @@ return SCR_Run ("SCR::Dir", args); } +static PyObject * ycp_y2logger (PyObject *self, PyObject *args) { + + Py_y2logger(args); + return Py_None; +} + +/** + * This is needed for importing new module from ycp. + */ +static PyMethodDef new_module_methods[] = { + {"__run", ycp_handle_function, METH_VARARGS, "Calling YCP from Python"}, + {NULL, NULL, 0, NULL} +}; + static PyMethodDef YCPMethods[] = { {"run", ycp_handle_function, METH_VARARGS, "Calling YCP from Python"}, @@ -120,16 +140,13 @@ {"SCR_Write", ycp_scr_write, METH_VARARGS, "SCR Write function"}, {"SCR_Execute", ycp_scr_execute, METH_VARARGS, "SCR Execute function"}, {"SCR_Dir", ycp_scr_dir, METH_VARARGS, "SCR Dir function"}, + {"y2logger", ycp_y2logger, METH_VARARGS, "Logging error, debug messages and milestones in python"}, {NULL, NULL, 0, NULL} /* Sentinel */ }; PyMODINIT_FUNC initycp(void) { - char func_code[] = - "def _factory(module, name):\n\ - def FunctionCall(*args):\n\ - return ycp.run(module, name, *args)\n\ - return FunctionCall"; + PyObject *traceback; char class_type_code[] = "class YCPType:\n\ @@ -159,87 +176,141 @@ self.name = name\n\ self.value = args"; + char func_y2internal[] = + "def y2internal(message):\n\ + file, line, func, txt = traceback.extract_stack(None, 2)[0]\n\ + y2logger(5, file, line, func, message)"; + + char func_y2security[] = + "def y2security(message):\n\ + file, line, func, txt = traceback.extract_stack(None, 2)[0]\n\ + y2logger(4, file, line, func, message)"; + + char func_y2error[] = + "def y2error(message):\n\ + file, line, func, txt = traceback.extract_stack(None, 2)[0]\n\ + y2logger(3, file, line, func, message)"; + + char func_y2warning[] = + "def y2warning(message):\n\ + file, line, func, txt = traceback.extract_stack(None, 2)[0]\n\ + y2logger(2, file, line, func, message)"; + + char func_y2milestone[] = + "def y2milestone(message):\n\ + file, line, func, txt = traceback.extract_stack(None, 2)[0]\n\ + y2logger(1, file, line, func, message)"; + + char func_y2debug[] = + "def y2debug(message):\n\ + file, line, func, txt = traceback.extract_stack(None, 2)[0]\n\ + y2logger(0, file, line, func, message)"; + PyRun_SimpleString("import sys, traceback"); + Self = Py_InitModule("ycp", YCPMethods); - (void) Py_InitModule("ycp", YCPMethods); + traceback = PyImport_AddModule("traceback"); + PyModule_AddObject(Self,"traceback",traceback); init_wfm (); - PyRun_SimpleString(func_code); + PyObject *dict = PyModule_GetDict(Self); + PyObject *code; - PyRun_SimpleString(class_type_code); + - PyRun_SimpleString(class_symbol_type_code); - PyRun_SimpleString(class_path_type_code); + code = PyRun_String(class_type_code, Py_single_input, dict, dict); + Py_XDECREF(code); - PyRun_SimpleString(class_term_type_code); -} + code = PyRun_String(class_symbol_type_code, Py_single_input, dict, dict); + Py_XDECREF(code); -bool RegFunctions(char *NameSpace, YCPList list_functions) { - string nameSpace(NameSpace); - string function; - string python_code; - string postfix("Static"); // here can be random generated string + code = PyRun_String(class_path_type_code, Py_single_input, dict, dict); + Py_XDECREF(code); - python_code = "class " + nameSpace + postfix + ":"; - for (int i=0; i<list_functions.size();i++) { - function = list_functions->value(i)->asString()->value(); + code = PyRun_String(class_term_type_code, Py_single_input, dict, dict); + Py_XDECREF(code); - python_code += "\n\tdef " + function + "(self, *args):"; - python_code += "\n\t\treturn ycp.run(\"" + nameSpace + "\", \"" + function + "\", *args)"; - } + code = PyRun_String(func_y2internal, Py_single_input, dict, dict); + Py_XDECREF(code); - // registration into ycp module with nameSpace as name - python_code += "\nycp.__dict__['" + nameSpace + "'] = " + nameSpace + postfix + "()"; + code = PyRun_String(func_y2security, Py_single_input, dict, dict); + Py_XDECREF(code); - // debug: - //std::cout << "==============================" << std::endl; - //std::cout << python_code << std::endl; - //std::cout << "==============================" << std::endl; + code = PyRun_String(func_y2error, Py_single_input, dict, dict); + Py_XDECREF(code); - PyRun_SimpleString(python_code.c_str()); + code = PyRun_String(func_y2warning, Py_single_input, dict, dict); + Py_XDECREF(code); + + code = PyRun_String(func_y2milestone, Py_single_input, dict, dict); + Py_XDECREF(code); + + code = PyRun_String(func_y2debug, Py_single_input, dict, dict); + Py_XDECREF(code); - return true; } -/* + + +/** + * Returns true if NameSpace is registered (is key) in dictionary dict. + * Otherwise returns false; + */ +bool isRegistered(PyObject *dict, const char *NameSpace) +{ + bool ret = false; + PyObject *name_space = PyString_FromString(NameSpace); + + if (PyDict_Contains(dict, name_space) == 1) + ret = true; + + + Py_XDECREF(name_space); + + return ret; +} bool RegFunctions(char *NameSpace, YCPList list_functions) { - string reg_line_dict = "ycp.__dict__['"; - string reg_line_name; - string reg_line_factory = " = _factory(\""; - reg_line_factory += NameSpace; - reg_line_factory += "\",\""; - reg_line_name.insert(0,NameSpace); - reg_line_name += "_"; - string function; - string command; + // Dictionary of ycp module + PyObject *ycp_dict = PyModule_GetDict(Self); + if (ycp_dict == NULL) return false; + // If already registered return true + if (isRegistered(ycp_dict, NameSpace)) return true; - for (int i=0; i<list_functions.size();i++) { - function = list_functions->value(i)->asString()->value(); - command = reg_line_dict; - command += reg_line_name; - command += function; - command += "']"; - command +=reg_line_factory; - command += function; - command += "\")"; + // Init new module with name NameSpace and method __run (see new_module_methods) + PyObject *new_module = Py_InitModule(NameSpace, new_module_methods); + if (new_module == NULL) return false; - PyRun_SimpleString(command.c_str()); - //printf("command for ycp %s\n", command.c_str()); - - } + // Add new initialized module into ycp dictionary (can be accessed via ycp.NameSpace) + PyDict_SetItemString(ycp_dict, NameSpace, new_module); - return true; + // Dictionary of new_module - there will be registered all functions + PyObject *new_module_dict = PyModule_GetDict(new_module); + if (new_module_dict == NULL) return false; + + PyObject *code; + string func_def; + string function; + for (int i=0; i<list_functions.size();i++) { + function = list_functions->value(i)->asString()->value(); + func_def = "def " + function + "(*args):"; + func_def += "\n\treturn __run(\"" + string(NameSpace) + "\", \"" + function + "\", *args)"; + + // Register function into dictionary of new module. Returns new reference - must be decremented + code = PyRun_String(func_def.c_str(), Py_single_input, new_module_dict, new_module_dict); + Py_XDECREF(code); + } + return true; } -*/ + Y2Component *owned_wfmc = 0; @@ -334,14 +405,14 @@ ns->initialize (); } + ycp_ListFunctions = new YCPList(); - //printf("List of function:\n"); - ns->table()->forEach (&HandleSymbolTable); - //printf("End list\n"); + ns->table()->forEach (&HandleSymbolTable); + RegFunctions(ns_name, *ycp_ListFunctions); - RegFunctions(ns_name, ycp_ListFunctions); delete [] ns_name; + delete ycp_ListFunctions; pResult = PyBool_FromLong(1); } @@ -637,6 +708,7 @@ } delete []ns_name; delete []func_name; + pReturnValue = ypython->YCPTypeToPythonSimpleType(ycpRetValue); if (!pReturnValue) pReturnValue = ypython->fromYCPListToPythonList(ycpRetValue); @@ -658,6 +730,66 @@ } +void Py_y2logger(PyObject *args) { + + int number_args = PyTuple_Size(args); + PyObject * pPythonValue; + loglevel_t level = LOG_DEBUG; + string file; + int line = 0; + string function; + string message; + if (number_args == 5) { + //obtain name of namespace (first argument) + pPythonValue = PyTuple_GetItem(args, 0); + if (pPythonValue) { + if (PyInt_Check(pPythonValue)) { + level = (loglevel_t)PyInt_AsLong(pPythonValue); + } else { + y2error("Wrong type of argument"); + } + } + pPythonValue = PyTuple_GetItem(args, 1); + if (pPythonValue) { + if (PyString_Check(pPythonValue)) { + file = PyString_AsString(pPythonValue); + } else { + y2error("Wrong type of argument"); + } + } + + pPythonValue = PyTuple_GetItem(args, 2); + if (pPythonValue) { + if (PyInt_Check(pPythonValue)) { + line = (int)PyInt_AsLong(pPythonValue); + } else { + y2error("Wrong type of argument"); + } + } + pPythonValue = PyTuple_GetItem(args, 3); + if (pPythonValue) { + if (PyString_Check(pPythonValue)) { + function = PyString_AsString(pPythonValue); + } else { + y2error("Wrong type of argument"); + } + } + pPythonValue = PyTuple_GetItem(args, 4); + if (pPythonValue) { + if (PyString_Check(pPythonValue)) { + message = PyString_AsString(pPythonValue); + } else { + y2error("Wrong type of argument"); + } + } + + y2_logger_function(level, Y2LOG, file.c_str(), line, function.c_str(),"%s", message.c_str()); + } else { + y2error("Wrong number of arguments"); + } +} + + void delete_all () { if (owned_uic != 0) { 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 Wed Sep 26 11:39:15 2007 @@ -52,10 +52,9 @@ YPython::YPython() { PyObject* pMain; - PyObject* pYCP; PyObject* pMainDict; pMain = PyImport_AddModule("__main__"); - pYCP = PyImport_AddModule("ycp"); + PyRun_SimpleString("from ycp import *"); pMainDict = PyModule_GetDict(pMain); pPathClass = PyDict_GetItemString(pMainDict, "Path"); pSymbolClass = PyDict_GetItemString(pMainDict, "Symbol"); Modified: trunk/python-bindings/src/YPythonNamespace.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YPythonNames… ============================================================================== --- trunk/python-bindings/src/YPythonNamespace.cc (original) +++ trunk/python-bindings/src/YPythonNamespace.cc Wed Sep 26 11:39:15 2007 @@ -9,6 +9,7 @@ #define y2log_component "Y2PythonNamespace" #include <ycp/y2log.h> +#include <ycp/pathsearch.h> #include <ycp/YCPElement.h> #include <ycp/Type.h> @@ -149,7 +150,7 @@ PyObject* item; //item from list of globals symbols from __main__ PyObject* num_args; //number of function argumets in python PyObject * fun_names; //list of globals symbols from __main__ - + string module; FILE* file; int num_fun_names = 0; @@ -161,16 +162,21 @@ //add __main__ module pMain = PyImport_AddModule("__main__"); PyRun_SimpleString("import __main__"); + //PyRun_SimpleString("import ycp"); //import inspect module - necessary for number of function arguments PyRun_SimpleString("import inspect"); //obtain main dictionary of globals variables pMainDict = PyModule_GetDict(pMain); - //Open file and his running in main module - file = fopen(strcat((char *) c_name, ".py"), "r"); + + module = YCPPathSearch::find (YCPPathSearch::Module, name + ".py"); + + + file = fopen(module.c_str(), "r"); if (file) { - PyRun_SimpleFile(file, strcat((char *) c_name, ".py")); + y2milestone("module name %s", module.c_str()); + PyRun_SimpleFile(file, module.c_str()); } //symbols from __main__ PyRun_SimpleString("fun_names = dir(__main__)"); @@ -222,7 +228,7 @@ } // end of for (int i = 0; i < num_fun_names; i++) delete []command; - Py_CLEAR(fun_names); + //Py_CLEAR(fun_names); -- 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] r41102 - in /trunk/python-bindings/src: YCPTypes.cc YCPTypes.h YCPTypes/ YCPTypes/Path.cc YCPTypes/Symbol.cc YCPTypes/Term.cc YCPTypes/YCPTypesInternal.cc YCPTypes/YCPTypesInternal.h
by dfiser＠svn.opensuse.org 26 Sep '07

26 Sep '07

Author: dfiser Date: Wed Sep 26 11:35:28 2007 New Revision: 41102 URL: http://svn.opensuse.org/viewcvs/yast?rev=41102&view=rev Log: Added files with defined YCP types (Term, Symbol, Path) for usage in Python. Added: trunk/python-bindings/src/YCPTypes/ trunk/python-bindings/src/YCPTypes.cc trunk/python-bindings/src/YCPTypes.h trunk/python-bindings/src/YCPTypes/Path.cc trunk/python-bindings/src/YCPTypes/Symbol.cc trunk/python-bindings/src/YCPTypes/Term.cc trunk/python-bindings/src/YCPTypes/YCPTypesInternal.cc trunk/python-bindings/src/YCPTypes/YCPTypesInternal.h Added: trunk/python-bindings/src/YCPTypes.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPTypes.cc?… ============================================================================== --- trunk/python-bindings/src/YCPTypes.cc (added) +++ trunk/python-bindings/src/YCPTypes.cc Wed Sep 26 11:35:28 2007 @@ -0,0 +1,105 @@ +#include "YCPTypes.h" +using std::string; + +bool initYCPTypes(PyObject *module) +{ + if (PyType_Ready(&SymbolType) < 0) + return false; + if (PyType_Ready(&PathType) < 0) + return false; + if (PyType_Ready(&TermType) < 0) + return false; + + Py_INCREF(&SymbolType); + PyModule_AddObject(module, "Symbol", (PyObject *)&SymbolType); + Py_INCREF(&PathType); + PyModule_AddObject(module, "Path", (PyObject *)&PathType); + Py_INCREF(&TermType); + PyModule_AddObject(module, "Term", (PyObject *)&TermType); + + return true; +} + +bool isYCPType(PyObject *obj) +{ + if (isSymbol(obj) || isPath(obj) || isTerm(obj)) + return true; + return false; +} + +YCPType getType(PyObject *obj) +{ + if (isSymbol(obj)) + return SYMBOL; + if (isPath(obj)) + return PATH; + if (isTerm(obj)) + return TERM; + return NOT_YCP_TYPE; +} + + +/***** Symbol *****/ +bool isSymbol(PyObject *obj) +{ + if (PyInstance_Check(obj) + && PyObject_IsInstance(obj, (PyObject *)&SymbolType)) + return true; + return false; +} + +string Symbol_getValue(Symbol *obj) +{ + if (isSymbol((PyObject *)obj)){ + return string(PyString_AsString(obj->value)); + } + return string(); +} +/***** Symbol END *****/ + + +/***** Path *****/ +bool isPath(PyObject *obj) +{ + if (PyInstance_Check(obj) + && PyObject_IsInstance(obj, (PyObject *)&PathType)) + return true; + return false; +} + +string Path_getValue(Path *obj) +{ + if (isPath((PyObject *)obj)){ + return string(PyString_AsString(obj->value)); + } + return string(); +} +/***** Path END *****/ + + +/***** Term *****/ +bool isTerm(PyObject *obj) +{ + if (PyInstance_Check(obj) + && PyObject_IsInstance(obj, (PyObject *)&TermType)) + return true; + return false; +} + +string Term_getName(Term *obj) +{ + if (isTerm((PyObject *)obj)){ + return string(PyString_AsString(obj->name)); + } + return string(); +} + +PyObject *Term_getValue(Term *obj) +{ + if (isTerm((PyObject *)obj)){ + return obj->value; + } + return Py_None; +} +/***** Term END *****/ + Added: trunk/python-bindings/src/YCPTypes.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPTypes.h?r… ============================================================================== --- trunk/python-bindings/src/YCPTypes.h (added) +++ trunk/python-bindings/src/YCPTypes.h Wed Sep 26 11:35:28 2007 @@ -0,0 +1,80 @@ +#ifndef _YCPTYPES_H_ +#define _YCPTYPES_H_ + +#include <string> +#include "Python.h" +#include "structmember.h" + +/** + * Generic YCP type which has one string member named value + * and one member for storing computed hash. + */ +typedef struct { + PyObject_HEAD + PyObject *value; //string + long hash; +} YCPTypeString; + +/** + * Symbol + */ +typedef YCPTypeString Symbol; +extern PyTypeObject SymbolType; + +bool isSymbol(PyObject *); +std::string Symbol_getValue(Symbol *); + + +/** + * Path + */ +typedef YCPTypeString Path; +extern PyTypeObject PathType; + +bool isPath(PyObject *); +std::string Path_getValue(Path *); + + +/** + * Term + * Term is composed from name (string) and value (tuple of various types) + */ +typedef struct{ + PyObject_HEAD + PyObject *name; // string + PyObject *value; // tuple of various types + long hash; +} Term; +extern PyTypeObject TermType; + +bool isTerm(PyObject *); +std::string Term_getName(Term *); + +/** + * Returns list or None. + * Borrowed reference! + */ +PyObject *Term_getValue(Term *); + + +/** + * Initialize alll YCP types + */ +bool initYCPTypes(PyObject *module); + +bool isYCPType(PyObject *); + + +/** + * Usage: + * switch (getType(obj)){ + * case PATH: + * ... + * case SYMBOL: + * ... + * } + */ +enum YCPType { NOT_YCP_TYPE, PATH, SYMBOL, TERM }; +YCPType getType(PyObject *); + +#endif Added: trunk/python-bindings/src/YCPTypes/Path.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPTypes/Pat… ============================================================================== --- trunk/python-bindings/src/YCPTypes/Path.cc (added) +++ trunk/python-bindings/src/YCPTypes/Path.cc Wed Sep 26 11:35:28 2007 @@ -0,0 +1,158 @@ +#include "YCPTypesInternal.h" +using std::string; + +/** + * Returns new Path object created from string str. + * Returns New Reference! + */ +static PyObject *Path_StringNew(const char *str) +{ + PyObject *ret; + PyObject *args; + + // create args variable + args = Py_BuildValue("(s)", str); + + // create new Path object + ret = YCPTypeString_new(&PathType, Py_None, Py_None); + if (ret == NULL){ + Py_XDECREF(args); + return Py_None; + } + + // initialize Path object + if (YCPTypeString_init((YCPTypeString *)ret, args, Py_None) == -1){ + Py_XDECREF(args); + return Py_None; + } + + Py_XDECREF(args); + return ret; +} + + + +/** + * Compare two Path objects. + * If obj1 or obj2 are not Paths returns -1 (it means not equal) + */ +static int Path_cmp(PyObject *obj1, PyObject *obj2) +{ + char *str1, *str2; + int ret = 0; + + // check is obj1 and obj2 are Paths + if (PyObject_IsInstance(obj1, (PyObject *)&PathType) != 1 || + PyObject_IsInstance(obj2, (PyObject *)&PathType) != 1) + return -1; + + str1 = PyString_AsString(((Path *)obj1)->value); + str2 = PyString_AsString(((Path *)obj2)->value); + + ret = strcmp(str1, str2); + if (ret != 0) + return ret < 0 ? -1 : 1; + return ret; +} + + +/** + * Returns New Reference! + */ +static PyObject *Path_append(Path *self, PyObject *arg) +{ + const char *str = PyString_AsString(self->value); + string new_value(str); + + // check if arg is string + if (!PyString_CheckExact(arg)){ + PyErr_SetString(PyExc_TypeError, ": argument 1 must be string"); + return Py_None; + } + + // concate strings + str = PyString_AsString(arg); + new_value += "."; + new_value += str; + + return Path_StringNew(new_value.c_str()); +} + +/** + * Returns New Reference! + */ +static PyObject *Path_prepend(Path *self, PyObject *arg) +{ + string new_value; + + // check if arg is string + if (!PyString_CheckExact(arg)){ + PyErr_SetString(PyExc_TypeError, ": argument 1 must be string"); + return Py_None; + } + + // concate strings + new_value = PyString_AsString(arg); + new_value += "."; + new_value += PyString_AsString(self->value); + + return Path_StringNew(new_value.c_str()); +} + +static PyMethodDef Path_methods[] = { + {"append", (PyCFunction)Path_append, METH_O, "Return new Path object with appended path given in argument."}, + {"prepend", (PyCFunction)Path_prepend, METH_O, "Return new Path object with perpended path given in argument."}, + {NULL} /* Sentinel */ +}; + +/** + * List of accessible members of Path. + */ +static PyMemberDef Path_members[] = { + // value is accessible only for read + {"value", T_OBJECT_EX, offsetof(Path, value), READONLY, "Value of symbol"}, + {NULL} /* Sentinel */ +}; + +PyTypeObject PathType = { + PyObject_HEAD_INIT(NULL) + 0, /*ob_size*/ + "ycp.Path", /*tp_name*/ + sizeof(Path), /*tp_basicsize*/ + 0, /*tp_itemsize*/ + (destructor)YCPTypeString_dealloc,/*tp_dealloc*/ + 0, /*tp_print*/ + 0, /*tp_getattr*/ + 0, /*tp_setattr*/ + (cmpfunc)Path_cmp, /*tp_compare*/ + 0, /*tp_repr*/ + 0, /*tp_as_number*/ + 0, /*tp_as_sequence*/ + 0, /*tp_as_mapping*/ + (hashfunc)YCPTypeString_hash,/*tp_hash */ + 0, /*tp_call*/ + 0, /*tp_str*/ + 0, /*tp_getattro*/ + 0, /*tp_setattro*/ + 0, /*tp_as_buffer*/ + Py_TPFLAGS_DEFAULT, /*tp_flags*/ + "YCP Paths", /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + Path_methods, /* tp_methods */ + Path_members, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + (initproc)YCPTypeString_init,/* tp_init */ + 0, /* tp_alloc */ + YCPTypeString_new, /* tp_new */ +}; + Added: trunk/python-bindings/src/YCPTypes/Symbol.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPTypes/Sym… ============================================================================== --- trunk/python-bindings/src/YCPTypes/Symbol.cc (added) +++ trunk/python-bindings/src/YCPTypes/Symbol.cc Wed Sep 26 11:35:28 2007 @@ -0,0 +1,81 @@ +#include "YCPTypesInternal.h" + +/** + * Compare two Symbol objects. + * If obj1 or obj2 are not Symbols returns -1 (it means not equal) + */ +static int Symbol_cmp(PyObject *obj1, PyObject *obj2) +{ + char *str1, *str2; + int ret = 0; + + // check is obj1 and obj2 are Symbols + if (PyObject_IsInstance(obj1, (PyObject *)&SymbolType) != 1 || + PyObject_IsInstance(obj2, (PyObject *)&SymbolType) != 1) + return -1; + + str1 = PyString_AsString(((Symbol *)obj1)->value); + str2 = PyString_AsString(((Symbol *)obj2)->value); + + ret = strcmp(str1, str2); + if (ret != 0) + return ret < 0 ? -1 : 1; + return ret; +} + + +static PyMethodDef Symbol_methods[] = { + {NULL} /* Sentinel */ +}; + +/** + * List of accessible members of Symbol. + */ +static PyMemberDef Symbol_members[] = { + // value is accessible only for read + {"value", T_OBJECT_EX, offsetof(Symbol, value), READONLY, "Value of symbol"}, + {NULL} /* Sentinel */ +}; + +PyTypeObject SymbolType = { + PyObject_HEAD_INIT(NULL) + 0, /*ob_size*/ + "ycp.Symbol", /*tp_name*/ + sizeof(Symbol), /*tp_basicsize*/ + 0, /*tp_itemsize*/ + (destructor)YCPTypeString_dealloc,/*tp_dealloc*/ + 0, /*tp_print*/ + 0, /*tp_getattr*/ + 0, /*tp_setattr*/ + (cmpfunc)Symbol_cmp, /*tp_compare*/ + 0, /*tp_repr*/ + 0, /*tp_as_number*/ + 0, /*tp_as_sequence*/ + 0, /*tp_as_mapping*/ + (hashfunc)YCPTypeString_hash, /*tp_hash */ + 0, /*tp_call*/ + 0, /*tp_str*/ + 0, /*tp_getattro*/ + 0, /*tp_setattro*/ + 0, /*tp_as_buffer*/ + Py_TPFLAGS_DEFAULT, /*tp_flags*/ + "YCP Symbols", /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + Symbol_methods, /* tp_methods */ + Symbol_members, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + (initproc)YCPTypeString_init, /* tp_init */ + 0, /* tp_alloc */ + YCPTypeString_new, /* tp_new */ +}; + Added: trunk/python-bindings/src/YCPTypes/Term.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPTypes/Ter… ============================================================================== --- trunk/python-bindings/src/YCPTypes/Term.cc (added) +++ trunk/python-bindings/src/YCPTypes/Term.cc Wed Sep 26 11:35:28 2007 @@ -0,0 +1,170 @@ +#include "YCPTypesInternal.h" + +/** + * Deallocate Term object + */ +static void Term_dealloc(Term *self) +{ + Py_XDECREF(self->name); + Py_XDECREF(self->value); + self->ob_type->tp_free((PyObject *)self); +} + +/** + * This function is called before Term_init. + * In this function is set only default values. + */ +static PyObject *Term_new(PyTypeObject *type, PyObject *args, + PyObject *kwds) +{ + Term *self; + + self = (Term *)type->tp_alloc(type, 0); + if (self != NULL){ + self->name = PyString_FromString(""); + if (self->name == NULL){ + Py_DECREF(self); + return NULL; + } + self->value = PyTuple_New(0); + if (self->value == NULL){ + Py_DECREF(self); + return NULL; + } + + self->hash = -1; + } + + return (PyObject *)self; +} + +/** + * Initialize Term object. + */ +int Term_init(Term *self, PyObject *args, PyObject *kwds) +{ + PyObject *name = NULL; + PyObject *value = NULL; + PyObject *tmp; + int args_size; + + // check number of arguments + args_size = PyTuple_Size(args); + if (args_size < 1){ + PyErr_SetString(PyExc_TypeError, ": function takes exactly 1 argument (0 given)"); + return -1; + } + + // name: + name = PyTuple_GetItem(args, 0); + if (PyString_CheckExact(name)){ + tmp = self->name; + Py_INCREF(name); + self->name = name; + Py_XDECREF(tmp); + }else{ + PyErr_SetString(PyExc_TypeError, ": argument 1 must be string"); + return -1; + } + + // value: + if (args_size > 1){ + value = PyTuple_GetSlice(args, 1, args_size); // return new reference + if (value != NULL){ + tmp = self->value; + self->value = value; + Py_XDECREF(tmp); + } + } + + return 0; +} + +/** + * Returns hash of Term object. + */ +long Term_hash(Term *self) +{ + if (self->hash != -1){ + self->hash = PyObject_Hash(self->name) + PyObject_Hash(self->value); + } + return self->hash; +} + +/** + * Compare two Term objects. + * If obj1 or obj2 are not Terms returns -1 (it means not equal) + */ +static int Term_cmp(PyObject *obj1, PyObject *obj2) +{ + // check if obj1 and obj2 are Terms + if (PyObject_IsInstance(obj1, (PyObject *)&TermType) != 1 || + PyObject_IsInstance(obj2, (PyObject *)&TermType) != 1) + return -1; + + if (PyObject_Compare(((Term *)obj1)->name, ((Term *)obj2)->name) == 0 && + PyObject_Compare(((Term *)obj1)->value, ((Term *)obj2)->value) == 0){ + return 0; + } + return 1; +} + + + +static PyMethodDef Term_methods[] = { + {NULL} /* Sentinel */ +}; + +/** + * List of accessible members of Term. + */ +static PyMemberDef Term_members[] = { + // value is accessible only for read + {"name", T_OBJECT_EX, offsetof(Term, name), READONLY, "Name of the Term"}, + {"value", T_OBJECT_EX, offsetof(Term, value), READONLY, "Value of the Term"}, + {NULL} /* Sentinel */ +}; + +PyTypeObject TermType = { + PyObject_HEAD_INIT(NULL) + 0, /*ob_size*/ + "ycp.Term", /*tp_name*/ + sizeof(Term), /*tp_basicsize*/ + 0, /*tp_itemsize*/ + (destructor)Term_dealloc,/*tp_dealloc*/ + 0, /*tp_print*/ + 0, /*tp_getattr*/ + 0, /*tp_setattr*/ + (cmpfunc)Term_cmp, /*tp_compare*/ + 0, /*tp_repr*/ + 0, /*tp_as_number*/ + 0, /*tp_as_sequence*/ + 0, /*tp_as_mapping*/ + (hashfunc)Term_hash,/*tp_hash */ + 0, /*tp_call*/ + 0, /*tp_str*/ + 0, /*tp_getattro*/ + 0, /*tp_setattro*/ + 0, /*tp_as_buffer*/ + Py_TPFLAGS_DEFAULT, /*tp_flags*/ + "YCP Terms", /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + Term_methods, /* tp_methods */ + Term_members, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + (initproc)Term_init,/* tp_init */ + 0, /* tp_alloc */ + Term_new, /* tp_new */ +}; + + Added: trunk/python-bindings/src/YCPTypes/YCPTypesInternal.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPTypes/YCP… ============================================================================== --- trunk/python-bindings/src/YCPTypes/YCPTypesInternal.cc (added) +++ trunk/python-bindings/src/YCPTypes/YCPTypesInternal.cc Wed Sep 26 11:35:28 2007 @@ -0,0 +1,52 @@ +#include "YCPTypesInternal.h" + +/********** YCPTypeString fucntions **********/ +void YCPTypeString_dealloc(YCPTypeString *self) +{ + Py_XDECREF(self->value); + self->ob_type->tp_free((PyObject *)self); +} + +PyObject *YCPTypeString_new(PyTypeObject *type, PyObject *args, + PyObject *kwds) +{ + YCPTypeString *self; + + self = (YCPTypeString *)type->tp_alloc(type, 0); + if (self != NULL){ + self->value = PyString_FromString(""); + if (self->value == NULL){ + Py_DECREF(self); + return NULL; + } + + self->hash = -1; + } + + return (PyObject *)self; +} + +int YCPTypeString_init(YCPTypeString *self, PyObject *args, PyObject *kwds) +{ + const char *value=NULL; + PyObject *tmp; + + if (!PyArg_ParseTuple(args, "s", &value)) + return -1; + + if (value != NULL) { + tmp = self->value; + self->value = Py_BuildValue("s", value); + Py_XDECREF(tmp); + } + + return 0; +} + +long YCPTypeString_hash(YCPTypeString *self) +{ + if (self->hash != -1){ + self->hash = PyObject_Hash(self->value); + } + return self->hash; +} Added: trunk/python-bindings/src/YCPTypes/YCPTypesInternal.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPTypes/YCP… ============================================================================== --- trunk/python-bindings/src/YCPTypes/YCPTypesInternal.h (added) +++ trunk/python-bindings/src/YCPTypes/YCPTypesInternal.h Wed Sep 26 11:35:28 2007 @@ -0,0 +1,32 @@ +#ifndef _YCP_TYPES_INTERNAL_H_ +#define _YCP_TYPES_INTERNAL_H_ + +#include <iostream> +#define DBG(str) \ + std::cerr << str << std::endl + +#include "YCPTypes.h" + +/********** YCPTypeString fucntions **********/ +/** + * Function which deallocate YCPTypeString type + */ +void YCPTypeString_dealloc(YCPTypeString *self); + +/** + * Create new YCPTypeString object. This function is called before _init function. + */ +PyObject *YCPTypeString_new(PyTypeObject *type, PyObject *args, + PyObject *kwds); + +/** + * Initialize YCPTypeString object. + */ +int YCPTypeString_init(YCPTypeString *self, PyObject *args, PyObject *kwds); + +/** + * Returns hash value of YCPTypeString object + */ +long YCPTypeString_hash(YCPTypeString *self); + +#endif -- 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] r41101 - /branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc
by gs＠svn.opensuse.org 26 Sep '07

26 Sep '07

Author: gs Date: Wed Sep 26 11:03:10 2007 New Revision: 41101 URL: http://svn.opensuse.org/viewcvs/yast?rev=41101&view=rev Log: temporarily add setParent and addChild for DirectoryTable (NCTable is not yet ported) Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCA… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc Wed Sep 26 11:03:10 2007 @@ -139,6 +139,11 @@ // add the list of directories dirList = new NCDirectoryTable( split, opt, NCFileTable::T_Overview, iniDir ); + // FIXME - remove this - will be obsolete when NCTable is migrated + dirList->setParent( split ); + split->addChild( dirList ); + // remove this + YStringWidgetID * dirListID = new YStringWidgetID( idDirList ); dirList->setId( dirListID ); -- 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] r41100 - in /branches/tmp/sh/mod-ui/ncurses/src: NCMenuButton.cc NCPopupMenu.cc
by gs＠svn.opensuse.org 26 Sep '07

26 Sep '07

Author: gs Date: Wed Sep 26 10:17:03 2007 New Revision: 41100 URL: http://svn.opensuse.org/viewcvs/yast?rev=41100&view=rev Log: create NCPopupMenu with 'new' Modified: branches/tmp/sh/mod-ui/ncurses/src/NCMenuButton.cc branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCMenuButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCM… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCMenuButton.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCMenuButton.cc Wed Sep 26 10:17:03 2007 @@ -193,18 +193,22 @@ NCursesEvent NCMenuButton::postMenu() { wpos at( ScreenPos() + wpos( win->height(), 0 ) ); - NCPopupMenu dialog( at, *getToplevelMenu() ); - int selection = dialog.post(); + NCPopupMenu * dialog = new NCPopupMenu( at, *getToplevelMenu() ); + int selection = dialog->post(); - if ( selection < 0 ) + if ( selection < 0 ) { + YDialog::deleteTopmostDialog(); return NCursesEvent::none; - + } + NCursesEvent ret = NCursesEvent::menu; - // FIXME + // FIXME - check this YCPValue value = indexToId( selection ); YStringWidgetID * selectionID = new YStringWidgetID( value->toString()); ret.selection = selectionID; + YDialog::deleteTopmostDialog(); + return ret; } Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc Wed Sep 26 10:17:03 2007 @@ -103,8 +103,9 @@ if ( menu.itemList()[selection]->hasChildren() ) { // post submenu wpos at( ScreenPos() + wpos( selection, inparent.Sze.W - 1 ) ); - NCPopupMenu dialog( at, *menu.itemList()[selection] ); - again = (dialog.post( &postevent ) == NCursesEvent::CONTINUE); + NCPopupMenu * dialog = new NCPopupMenu( at, *menu.itemList()[selection] ); + again = (dialog->post( &postevent ) == NCursesEvent::CONTINUE); + YDialog::deleteTopmostDialog(); } else { // store selection postevent.detail = menu.itemList()[selection]->getIndex(); -- 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] r41099 - /branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.cc
by gs＠svn.opensuse.org 26 Sep '07

26 Sep '07

Author: gs Date: Wed Sep 26 09:56:46 2007 New Revision: 41099 URL: http://svn.opensuse.org/viewcvs/yast?rev=41099&view=rev Log: sellist->setNotify( true ); Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.cc Wed Sep 26 09:56:46 2007 @@ -61,6 +61,7 @@ if ( sellist ) return; + // FIXME: remove opt - will be obsolete once YTable is migrated YWidgetOpt opt; opt.notifyMode.setValue( true ); @@ -69,7 +70,8 @@ sellist->SetSepChar( ' ' ); sellist->SetSepWidht( 0 ); sellist->SetHotCol( 0 ); - + sellist->setNotify( true ); + // TO DO: This will be obsolete once YTable is migrated // TO DO: This will be obsolete once YTable is migrated // TO DO: This will be obsolete once YTable is migrated -- 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] r41098 - in /branches/tmp/sh/mod-ui/ncurses/src: NCPopupTable.cc NCPopupTable.h
by gs＠svn.opensuse.org 26 Sep '07

26 Sep '07

Author: gs Date: Wed Sep 26 09:49:58 2007 New Revision: 41098 URL: http://svn.opensuse.org/viewcvs/yast?rev=41098&view=rev Log: remove unused code Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.cc branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.h Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.cc Wed Sep 26 09:49:58 2007 @@ -18,11 +18,9 @@ /-*/ #include "Y2Log.h" #include "NCPopupTable.h" -#include "NCPushButton.h" #include "NCTable.h" #include "YMenuButton.h" -#include "NCLayoutBox.h" /////////////////////////////////////////////////////////////////// // @@ -35,7 +33,6 @@ NCPopupTable::NCPopupTable( const wpos at ) : NCPopup( at, false ) , sellist( 0 ) - , position( at ) { } @@ -73,8 +70,6 @@ sellist->SetSepWidht( 0 ); sellist->SetHotCol( 0 ); - NCMIL << "CurrentDialog firstChild: " << dynamic_cast<NCWidget *>(currentDialog()->firstChild()) << endl; - // TO DO: This will be obsolete once YTable is migrated // TO DO: This will be obsolete once YTable is migrated // TO DO: This will be obsolete once YTable is migrated @@ -174,30 +169,3 @@ sellist->stripHotkeys(); } } - -#if 0 -int NCPopupTable::preferredWidth() -{ - wsze sze = wGetDefsze(); - if ( sellist ) - return sellist->preferredWidth(); - else - return sze.W; -} - -int NCPopupTable::preferredHeight() -{ - wsze sze = wGetDefsze(); - if ( sellist ) - return sellist->preferredHeight(); - else - return sze.H; -} - -void NCPopupTable::setSize( int newwidth, int newheight ) -{ - NCMIL << "setSize() called with w: " << newwidth << " h: " << newheight << endl; - wRelocate( position, wsze( newheight, newwidth ) ); - firstChild()->setSize( newwidth, newheight ); -} -#endif Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.h Wed Sep 26 09:49:58 2007 @@ -42,8 +42,8 @@ NCPopupTable ( const NCPopupTable & ); private: + NCTable * sellist; - wpos position; protected: @@ -65,12 +65,6 @@ public: void stripHotkeys(); - - //int preferredWidth(); - //int preferredHeight(); - - //void setSize( int newwidth, int newheight ); - }; /////////////////////////////////////////////////////////////////// -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0