74dfb7ca23
Regression caused by [0] that caused the error message to be
created based on a normalized exception (which hid line numbers).
PyC_ExceptionBuffer{_Simple} & BPy_errors_to_report
no longer clears the exception.
This could have been resolved by changing python_script_error_jump
however that would involve changes to reference counting that are more
risky (noted in code-comment).
[0]: 2d2baeaf04
136 lines
2.8 KiB
C++
136 lines
2.8 KiB
C++
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
|
|
#pragma once
|
|
|
|
/** \file
|
|
* \ingroup freestyle
|
|
* \brief Python Interpreter
|
|
*/
|
|
|
|
#include <iostream>
|
|
|
|
extern "C" {
|
|
#include <Python.h>
|
|
}
|
|
|
|
#include "Interpreter.h"
|
|
#include "StringUtils.h"
|
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
// soc
|
|
#include "DNA_text_types.h"
|
|
|
|
#include "BKE_context.h"
|
|
#include "BKE_global.h"
|
|
#include "BKE_lib_id.h"
|
|
#include "BKE_main.h"
|
|
#include "BKE_report.h"
|
|
#include "BKE_text.h"
|
|
|
|
#include "BPY_extern_run.h"
|
|
|
|
#include "bpy_capi_utils.h"
|
|
|
|
namespace Freestyle {
|
|
|
|
class PythonInterpreter : public Interpreter {
|
|
public:
|
|
PythonInterpreter()
|
|
{
|
|
_language = "Python";
|
|
_context = 0;
|
|
memset(&_freestyle_bmain, 0, sizeof(Main));
|
|
}
|
|
|
|
void setContext(bContext *C)
|
|
{
|
|
_context = C;
|
|
}
|
|
|
|
int interpretFile(const string &filename)
|
|
{
|
|
ReportList *reports = CTX_wm_reports(_context);
|
|
BKE_reports_clear(reports);
|
|
char *fn = const_cast<char *>(filename.c_str());
|
|
#if 0
|
|
bool ok = BPY_run_filepath(_context, fn, reports);
|
|
#else
|
|
bool ok;
|
|
Text *text = BKE_text_load(&_freestyle_bmain, fn, G_MAIN->filepath);
|
|
if (text) {
|
|
ok = BPY_run_text(_context, text, reports, false);
|
|
BKE_id_delete(&_freestyle_bmain, text);
|
|
}
|
|
else {
|
|
BKE_reportf(reports, RPT_ERROR, "Cannot open file: %s", fn);
|
|
ok = false;
|
|
}
|
|
#endif
|
|
|
|
if (ok == false) {
|
|
cerr << "\nError executing Python script from PythonInterpreter::interpretFile" << endl;
|
|
cerr << "File: " << fn << endl;
|
|
cerr << "Errors: " << endl;
|
|
BKE_reports_print(reports, RPT_ERROR);
|
|
return 1;
|
|
}
|
|
|
|
// cleaning up
|
|
BKE_reports_clear(reports);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int interpretString(const string &str, const string &name)
|
|
{
|
|
ReportList *reports = CTX_wm_reports(_context);
|
|
|
|
BKE_reports_clear(reports);
|
|
|
|
if (!BPY_run_string_eval(_context, NULL, str.c_str())) {
|
|
BPy_errors_to_report(reports);
|
|
PyErr_Clear();
|
|
cerr << "\nError executing Python script from PythonInterpreter::interpretString" << endl;
|
|
cerr << "Name: " << name << endl;
|
|
cerr << "Errors: " << endl;
|
|
BKE_reports_print(reports, RPT_ERROR);
|
|
return 1;
|
|
}
|
|
|
|
BKE_reports_clear(reports);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int interpretText(struct Text *text, const string &name)
|
|
{
|
|
ReportList *reports = CTX_wm_reports(_context);
|
|
|
|
BKE_reports_clear(reports);
|
|
|
|
if (!BPY_run_text(_context, text, reports, false)) {
|
|
cerr << "\nError executing Python script from PythonInterpreter::interpretText" << endl;
|
|
cerr << "Name: " << name << endl;
|
|
cerr << "Errors: " << endl;
|
|
BKE_reports_print(reports, RPT_ERROR);
|
|
return 1;
|
|
}
|
|
|
|
BKE_reports_clear(reports);
|
|
|
|
return 0;
|
|
}
|
|
|
|
void reset()
|
|
{
|
|
// nothing to do
|
|
}
|
|
|
|
private:
|
|
bContext *_context;
|
|
Main _freestyle_bmain;
|
|
};
|
|
|
|
} /* namespace Freestyle */
|