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

py3: web: gathering diff of py3-branch

Browse Source 
76b3397762
ec9dcf7453d44ce21e6ab5e460293006a49e7ccc
11eb995a2e88df1125056403fb302ce85749f83c
This commit is contained in:
looooo 2017-03-02 09:02:12 +01:00 committed by wmayer
parent 99131438c6
commit f94e1ff280
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Web/Gui/AppWebGui.cpp
View File

@ -110,7 +110,7 @@ PyObject* initModule()
/* Python entry */ /* Python entry */
PyMODINIT_FUNC initWebGui() PyMOD_INIT_FUNC(WebGui)
{ {
if (!Gui::Application::Instance) { if (!Gui::Application::Instance) {
PyErr_SetString(PyExc_ImportError, "Cannot load Gui module in console application."); PyErr_SetString(PyExc_ImportError, "Cannot load Gui module in console application.");

3
src/Mod/Web/Gui/BrowserView.cpp
View File

@ -238,7 +238,8 @@ void BrowserView::onLinkClicked (const QUrl & url)
QString ext = fi.completeSuffix(); QString ext = fi.completeSuffix();
if (ext == QString::fromLatin1("py")) { if (ext == QString::fromLatin1("py")) {
try { try {
Gui::Command::doCommand(Gui::Command::Gui,"execfile('%s')",(const char*) fi.absoluteFilePath(). toLocal8Bit()); // Gui::Command::doCommand(Gui::Command::Gui,"execfile('%s')",(const char*) fi.absoluteFilePath(). toLocal8Bit());
Gui::Command::doCommand(Gui::Command::Gui,"exec(open('%s').read())",(const char*) fi.absoluteFilePath(). toLocal8Bit());
} }
catch (const Base::Exception& e) { catch (const Base::Exception& e) {
QMessageBox::critical(this, tr("Error"), QString::fromUtf8(e.what())); QMessageBox::critical(this, tr("Error"), QString::fromUtf8(e.what()));