diff --git a/src/Base/PyTools.c b/src/Base/PyTools.c index 39511cbe37..0b602682e7 100644 --- a/src/Base/PyTools.c +++ b/src/Base/PyTools.c @@ -215,18 +215,10 @@ FC_OS_LINUX: This is dangerous. How about PY_EXCEPT_MAX? /* exception text is here after PP_Fetch_Error_Text call */ char PP_last_error_type[MAX]; /* exception name text */ char PP_last_error_info[MAX]; /* exception data text */ - -//char PP_last_error_file[MAX]; /* exception file text */ -//unsigned int PP_last_error_line; /* exception line */ -//unsigned int PP_last_error_classindex; /* exception class type index (key of Base::Type) */ -//char PP_last_error_function[MAX]; /* exception function text */ -//char PP_last_error_message[MAX]; /* exception message text */ - -PyObject *PP_PyDict_Object = NULL; /* saved exception dictionary object */ - char PP_last_error_trace[MAX]; /* exception traceback text */ + PyObject *PP_last_traceback = NULL; /* saved exception traceback object */ -//bool PP_last_error_isDictType = false; +PyObject *PP_PyDict_Object = NULL; /* saved exception dictionary object */ void PP_Fetch_Error_Text() @@ -273,27 +265,7 @@ void PP_Fetch_Error_Text() strncpy(PP_last_error_info, PyString_AsString(pystring), MAX); PP_last_error_info[MAX-1] = '\0'; } - - /*pystring = PyDict_GetItemString(errdata,"sfile"); - strncpy(PP_last_error_file, PyString_AsString(pystring), MAX); - PP_last_error_file[MAX-1] = '\0'; - - pystring = PyDict_GetItemString(errdata,"sfunction"); - strncpy(PP_last_error_function, PyString_AsString(pystring), MAX); - PP_last_error_function[MAX-1] = '\0'; - - pystring = PyDict_GetItemString(errdata,"sErrMsg"); - strncpy(PP_last_error_message, PyString_AsString(pystring), MAX); - PP_last_error_message[MAX-1] = '\0'; - - pystring = PyDict_GetItemString(errdata,"iline"); - PP_last_error_line = PyInt_AsLong(pystring); - - pystring = PyDict_GetItemString(errdata,"classindex"); - PP_last_error_classindex = PyInt_AsLong(pystring); - - PP_last_error_isDictType = true; - */ + pydict = errdata; } else if (errdata != NULL && diff --git a/src/Base/PyTools.h b/src/Base/PyTools.h index 3e0b6cbf13..716af426d2 100644 --- a/src/Base/PyTools.h +++ b/src/Base/PyTools.h @@ -73,8 +73,6 @@ extern "C" { /* a C library, but callable from C++ */ # undef _POSIX_C_SOURCE #endif // (re-)defined in pyconfig.h #include - -//#include extern int PP_RELOAD; /* 1=reload py modules when attributes referenced */ extern int PP_DEBUG; /* 1=start debugger when string/function/member run */ @@ -182,15 +180,7 @@ extern char PP_last_error_type[]; /* exception name text */ extern char PP_last_error_info[]; /* exception data text */ extern char PP_last_error_trace[]; /* exception traceback text */ -//extern char PP_last_error_file[]; /* exception file text */ -//extern unsigned int PP_last_error_line; /* exception line */ -//extern unsigned int PP_last_error_classindex; /* exception class type index (key of Base::Type) */ -//extern char PP_last_error_function[]; /* exception function text */ -//extern char PP_last_error_message[]; /* exception message text */ -//extern bool PP_last_error_isDictType; - -extern PyObject *PP_PyDict_Object; /* saved PyDict object */ - +extern PyObject *PP_PyDict_Object; /* saved PyDict object */ extern PyObject *PP_last_traceback; /* saved exception traceback object */