|
|
|
@ -180,7 +180,7 @@ PyObject* PythonInterface::dbgOut = nil;
|
|
|
|
|
PyObject* PythonInterface::dbgSlice = nil; // time slice function for the debug window
|
|
|
|
|
plStatusLog* PythonInterface::dbgLog = nil; // output logfile
|
|
|
|
|
|
|
|
|
|
#ifndef PLASMA_EXTERNAL_RELEASE |
|
|
|
|
#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE) |
|
|
|
|
bool PythonInterface::usePythonDebugger = false; |
|
|
|
|
plCyDebServer PythonInterface::debugServer; |
|
|
|
|
bool PythonInterface::requestedExit = false; |
|
|
|
@ -189,7 +189,7 @@ bool PythonInterface::requestedExit = false;
|
|
|
|
|
// stupid Windows.h and who started including that!
|
|
|
|
|
#undef DrawText |
|
|
|
|
|
|
|
|
|
#ifndef PLASMA_EXTERNAL_RELEASE |
|
|
|
|
#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE) |
|
|
|
|
// Special includes for debugging
|
|
|
|
|
#include <frameobject.h> |
|
|
|
|
|
|
|
|
@ -840,7 +840,7 @@ void PythonInterface::initPython()
|
|
|
|
|
Py_SetProgramName("plasma"); |
|
|
|
|
Py_Initialize(); |
|
|
|
|
|
|
|
|
|
#ifndef PLASMA_EXTERNAL_RELEASE |
|
|
|
|
#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE) |
|
|
|
|
if (usePythonDebugger) |
|
|
|
|
{ |
|
|
|
|
debugServer.SetCallbackClass(&debServerCallback); |
|
|
|
@ -1512,7 +1512,7 @@ void PythonInterface::finiPython()
|
|
|
|
|
initialized--; |
|
|
|
|
if ( initialized < 1 && Py_IsInitialized() != 0 && IsInShutdown ) |
|
|
|
|
{ |
|
|
|
|
#ifndef PLASMA_EXTERNAL_RELEASE |
|
|
|
|
#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE) |
|
|
|
|
if (usePythonDebugger) |
|
|
|
|
debugServer.Disconnect(); |
|
|
|
|
#endif |
|
|
|
@ -1659,7 +1659,7 @@ int PythonInterface::getOutputAndReset(std::string *output)
|
|
|
|
|
pyOutputRedirector::ClearData(stdOut); |
|
|
|
|
|
|
|
|
|
// tell python debugger
|
|
|
|
|
#ifndef PLASMA_EXTERNAL_RELEASE |
|
|
|
|
#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE) |
|
|
|
|
if (UsePythonDebugger()) |
|
|
|
|
PythonInterface::PythonDebugger()->StdOut(strVal); |
|
|
|
|
#endif |
|
|
|
|