remove duplicate function for printing the current file:line of a python script in...
authorCampbell Barton <ideasman42@gmail.com>
Fri, 22 Jul 2011 11:21:01 +0000 (11:21 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 22 Jul 2011 11:21:01 +0000 (11:21 +0000)
source/gameengine/Expressions/PyObjectPlus.cpp
source/gameengine/Expressions/PyObjectPlus.h

index 3a25df73f9b903de0316cbbb06c1e310f8b62dcb..92be769ed71bf241bd54da6f3a30c9618a9abed3 100644 (file)
@@ -1184,46 +1184,10 @@ void PyObjectPlus::SetDeprecationWarnings(bool ignoreDeprecationWarnings)
        m_ignore_deprecation_warnings = ignoreDeprecationWarnings;
 }
 
-void PyDebugLine()
-{
-       // import sys; print '\t%s:%d' % (sys._getframe(0).f_code.co_filename, sys._getframe(0).f_lineno)
-
-       PyObject *getframe, *frame;
-       PyObject *f_lineno, *f_code, *co_filename;
-
-       getframe = PySys_GetObject((char *)"_getframe"); // borrowed
-       if (getframe) {
-               frame = PyObject_CallObject(getframe, NULL);
-               if (frame) {
-                       f_lineno= PyObject_GetAttrString(frame, "f_lineno");
-                       f_code= PyObject_GetAttrString(frame, "f_code");
-                       if (f_lineno && f_code) {
-                               co_filename= ((PyCodeObject *)f_code)->co_filename; /* borrow */
-                               if (co_filename) {
-
-                                       printf("\t%s:%d\n", _PyUnicode_AsString(co_filename), (int)PyLong_AsSsize_t(f_lineno));
-
-                                       Py_DECREF(f_lineno);
-                                       Py_DECREF(f_code);
-                                       Py_DECREF(frame);
-                                       return;
-                               }
-                       }
-                       
-                       Py_XDECREF(f_lineno);
-                       Py_XDECREF(f_code);
-                       Py_DECREF(frame);
-               }
-
-       }
-       PyErr_Clear();
-       printf("\tERROR - Could not access sys._getframe(0).f_lineno or sys._getframe().f_code.co_filename\n");
-}
-
 void PyObjectPlus::ShowDeprecationWarning_func(const char* old_way,const char* new_way)
 {
        printf("Method %s is deprecated, please use %s instead.\n", old_way, new_way);
-       PyDebugLine();
+       PyC_LineSpit();
 }
 
 void PyObjectPlus::ClearDeprecationWarning()
index 587f3e4ef351c6379aa79b3e44c1bef5e4f39e1c..51cfb5471c062623a4f2417a78bfd8d27503550c 100644 (file)
@@ -55,6 +55,7 @@
 #ifdef USE_MATHUTILS
 extern "C" {
 #include "../../blender/python/mathutils/mathutils.h" /* so we can have mathutils callbacks */
+#include "../../blender/python/generic/py_capi_utils.h" /* for PyC_LineSpit only */
 }
 #endif