From f94e1ff2804b7f11b61495c5d92af4cca9d9ccef Mon Sep 17 00:00:00 2001 From: looooo Date: Thu, 2 Mar 2017 09:02:12 +0100 Subject: [PATCH] py3: web: gathering diff of py3-branch 76b3397762cb8e24b589e5d6de1bb623382f61fd ec9dcf7453d44ce21e6ab5e460293006a49e7ccc 11eb995a2e88df1125056403fb302ce85749f83c --- src/Mod/Web/Gui/AppWebGui.cpp | 2 +- src/Mod/Web/Gui/BrowserView.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Mod/Web/Gui/AppWebGui.cpp b/src/Mod/Web/Gui/AppWebGui.cpp index 05bd47137..fc695303c 100644 --- a/src/Mod/Web/Gui/AppWebGui.cpp +++ b/src/Mod/Web/Gui/AppWebGui.cpp @@ -110,7 +110,7 @@ PyObject* initModule() /* Python entry */ -PyMODINIT_FUNC initWebGui() +PyMOD_INIT_FUNC(WebGui) { if (!Gui::Application::Instance) { PyErr_SetString(PyExc_ImportError, "Cannot load Gui module in console application."); diff --git a/src/Mod/Web/Gui/BrowserView.cpp b/src/Mod/Web/Gui/BrowserView.cpp index 52737ed53..bbf22af33 100644 --- a/src/Mod/Web/Gui/BrowserView.cpp +++ b/src/Mod/Web/Gui/BrowserView.cpp @@ -238,7 +238,8 @@ void BrowserView::onLinkClicked (const QUrl & url) QString ext = fi.completeSuffix(); if (ext == QString::fromLatin1("py")) { 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) { QMessageBox::critical(this, tr("Error"), QString::fromUtf8(e.what()));