suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0000717: Version info causes crash

Browse Source
This commit is contained in:
wmayer 2012-05-23 12:07:04 +02:00
parent 4c0da720b0
commit 27aef69cd9
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/App/ApplicationPy.cpp
View File

@ -383,23 +383,36 @@ PyObject* Application::sGetVersion(PyObject * /*self*/, PyObject *args,PyObject
if (!PyArg_ParseTuple(args, "")) // convert args: Python->C
return NULL; // NULL triggers exception
PyObject* pList = PyList_New(5);
PyObject *pItem;
pItem = PyString_FromString(Application::Config()["BuildVersionMajor"].c_str());
PyList_SetItem(pList, 0, pItem);
pItem = PyString_FromString(Application::Config()["BuildVersionMinor"].c_str());
PyList_SetItem(pList, 1, pItem);
pItem = PyString_FromString(Application::Config()["BuildRevision"].c_str());
PyList_SetItem(pList, 2, pItem);
pItem = PyString_FromString(Application::Config()["BuildRepositoryURL"].c_str());
PyList_SetItem(pList, 4, pItem);
pItem = PyString_FromString(Application::Config()["BuildCurrentDate"].c_str());
PyList_SetItem(pList, 6, pItem);
Py::List list;
const std::map<std::string, std::string>& cfg = Application::Config();
std::map<std::string, std::string>::const_iterator it;
return pList;
it = cfg.find("BuildVersionMajor");
list.append(Py::String(it != cfg.end() ? it->second : ""));
it = cfg.find("BuildVersionMinor");
list.append(Py::String(it != cfg.end() ? it->second : ""));
it = cfg.find("BuildRevision");
list.append(Py::String(it != cfg.end() ? it->second : ""));
it = cfg.find("BuildRepositoryURL");
list.append(Py::String(it != cfg.end() ? it->second : ""));
it = cfg.find("BuildRevisionDate");
list.append(Py::String(it != cfg.end() ? it->second : ""));
it = cfg.find("BuildRevisionBranch");
if (it != cfg.end())
list.append(Py::String(it->second));
it = cfg.find("BuildRevisionHash");
if (it != cfg.end())
list.append(Py::String(it->second));
return Py::new_reference_to(list);
}
PyObject* Application::sAddImportType(PyObject * /*self*/, PyObject *args,PyObject * /*kwd*/)
{
char *psKey,*psMod;