GIT_REPOSITORIES/LPP/PythonQt Commit - r25:60e7b3114ac6

changed to support dicts for variable lookup and eval...

florianlink -

r25:60e7b3114ac6

parent child

Context file:

r25:60e7b3114ac6

Collapse all files

src/PythonQt.cpp +64 -15

               for (QStringList::ConstIterator i = l.begin(); i!=l.end() && p; ++i) {
                 prev = p;
                 b = (*i).toLatin1();
-                p.setNewRef(PyObject_GetAttrString(p, b.data()));
+                if (PyDict_Check(p)) {
+                  p = PyDict_GetItemString(p, b.data());
+                } else {
+                  p.setNewRef(PyObject_GetAttrString(p, b.data()));
+                }
               }
               PyErr_Clear();
               return p;
               return PyDict_GetItemString(dict, "__main__");
             }
-            QVariant PythonQt::evalCode(PyObject* module, PyObject* pycode) {
+            QVariant PythonQt::evalCode(PyObject* object, PyObject* pycode) {
               QVariant result;
               if (pycode) {
-                PyObject* r = PyEval_EvalCode((PyCodeObject*)pycode, PyModule_GetDict((PyObject*)module) , PyModule_GetDict((PyObject*)module));
+                PyObject* dict = NULL;
+                if (PyModule_Check(object)) {
+                  dict = PyModule_GetDict(object);
+                } else if (PyDict_Check(object)) {
+                  dict = object;
+                }
+                PyObject* r = NULL;
+                if (dict) {
+                  r = PyEval_EvalCode((PyCodeObject*)pycode, dict , dict);
+                }
                 if (r) {
                   result = PythonQtConv::PyObjToQVariant(r);
                   Py_DECREF(r);
               return result;
             }
-            QVariant PythonQt::evalScript(PyObject* module, const QString& script, int start)
+            QVariant PythonQt::evalScript(PyObject* object, const QString& script, int start)
             {
               QVariant result;
               PythonQtObjectPtr p;
-              p.setNewRef(PyRun_String(script.toLatin1().data(), start, PyModule_GetDict(module), PyModule_GetDict(module)));
+              PyObject* dict = NULL;
+              if (PyModule_Check(object)) {
+                dict = PyModule_GetDict(object);
+              } else if (PyDict_Check(object)) {
+                dict = object;
+              }
+              if (dict) {
+                p.setNewRef(PyRun_String(script.toLatin1().data(), start, dict, dict));
+              }
               if (p) {
                 result = PythonQtConv::PyObjToQVariant(p);
               } else {
               return createModuleFromScript(moduleName);
             }
-            void PythonQt::addObject(PyObject* module, const QString& name, QObject* object)
+            void PythonQt::addObject(PyObject* object, const QString& name, QObject* qObject)
             {
-              PyModule_AddObject(module, name.toLatin1().data(), _p->wrapQObject(object));
+              if (PyModule_Check(object)) {
+                PyModule_AddObject(object, name.toLatin1().data(), _p->wrapQObject(qObject));
+              } else if (PyDict_Check(object)) {
+                PyDict_SetItemString(object, name.toLatin1().data(), _p->wrapQObject(qObject));
+              } else {
+                PyObject_SetAttrString(object, name.toLatin1().data(), _p->wrapQObject(qObject));
+              }
             }
-            void PythonQt::addVariable(PyObject* module, const QString& name, const QVariant& v)
+            void PythonQt::addVariable(PyObject* object, const QString& name, const QVariant& v)
             {
-              PyModule_AddObject(module, name.toLatin1().data(), PythonQtConv::QVariantToPyObject(v));
+              if (PyModule_Check(object)) {
+                PyModule_AddObject(object, name.toLatin1().data(), PythonQtConv::QVariantToPyObject(v));
+              } else if (PyDict_Check(object)) {
+                PyDict_SetItemString(object, name.toLatin1().data(), PythonQtConv::QVariantToPyObject(v));
+              } else {
+                PyObject_SetAttrString(object, name.toLatin1().data(), PythonQtConv::QVariantToPyObject(v));
+              }
             }
-            void PythonQt::removeVariable(PyObject* module, const QString& name)
+            void PythonQt::removeVariable(PyObject* object, const QString& name)
             {
-              PyObject_DelAttrString(module, name.toLatin1().data());
+              if (PyDict_Check(object)) {
+                PyDict_DelItemString(object, name.toLatin1().data());
+              } else {
+                PyObject_DelAttrString(object, name.toLatin1().data());
+              }
             }
-            QVariant PythonQt::getVariable(PyObject* module, const QString& objectname)
+            QVariant PythonQt::getVariable(PyObject* object, const QString& objectname)
             {
               QVariant result;
-              PythonQtObjectPtr obj = lookupObject(module, objectname);
+              PythonQtObjectPtr obj = lookupObject(object, objectname);
               if (obj) {
                 result = PythonQtConv::PyObjToQVariant(obj);
               }
                     }
                   }
                 } else {
-                  PyObject* keys = PyObject_Dir(object);
+                  PyObject* keys = NULL;
+                  bool isDict = false;
+                  if (PyDict_Check(object)) {
+                    keys = PyDict_Keys(object);
+                    isDict = true;
+                  } else {
+                    keys = PyObject_Dir(object);
+                  }
                   if (keys) {
                     int count = PyList_Size(keys);
                     PyObject* key;
                     QString keystr;
                     for (int i = 0;i<count;i++) {
                       key = PyList_GetItem(keys,i);
-                      value = PyObject_GetAttr(object, key);
+                      if (isDict) {
+                        value = PyDict_GetItem(object, key);
+                        Py_INCREF(value);
+                      } else {
+                        value = PyObject_GetAttr(object, key);
+                      }
                       if (!value) continue;
                       keystr = PyString_AsString(key);
                       static const QString underscoreStr("__tmp");

src/PythonQt.h +12 -12

               //! evaluates the given code and returns the result value (use Py_Compile etc. to create pycode from string)
               //! If pycode is NULL, a python error is printed.
-              QVariant evalCode(PyObject* module, PyObject* pycode);
+              QVariant evalCode(PyObject* object, PyObject* pycode);
               //! evaluates the given script code and returns the result value
-              QVariant evalScript(PyObject* module, const QString& script, int start = Py_file_input);
+              QVariant evalScript(PyObject* object, const QString& script, int start = Py_file_input);
               //! evaluates the given script code from file
-              void evalFile(PyObject* module, const QString& filename);
+              void evalFile(PyObject* object, const QString& filename);
               //! creates the new module \c name and evaluates the given file in the context of that module
               //! If the \c script is empty, the module contains no initial code. You can use evalScript/evalCode to add code
               //@{ Variable access
-              //! add the given \c object to the \c module as a variable with \c name (it can be removed via clearVariable)
+              //! add the given \c qObject to the python \c object as a variable with \c name (it can be removed via clearVariable)
-              void addObject(PyObject* module, const QString& name, QObject* object);
+              void addObject(PyObject* object, const QString& name, QObject* qObject);
-              //! add the given variable to the module
+              //! add the given variable to the object
-              void addVariable(PyObject* module, const QString& name, const QVariant& v);
+              void addVariable(PyObject* object, const QString& name, const QVariant& v);
               //! remove the given variable
               void removeVariable(PyObject* module, const QString& name);
-              //! get the variable with the \c name of the \c module, returns an invalid QVariant on error
+              //! get the variable with the \c name of the \c object, returns an invalid QVariant on error
-              QVariant getVariable(PyObject* module, const QString& name);
+              QVariant getVariable(PyObject* object, const QString& name);
-              //! read vars etc. in scope of a module, optional looking inside of an object \c objectname
+              //! read vars etc. in scope of an \c object, optional looking inside of an object \c objectname
-              QStringList introspection(PyObject* module, const QString& objectname, ObjectType type);
+              QStringList introspection(PyObject* object, const QString& objectname, ObjectType type);
               //! returns the found callable object or NULL
               //! @return new reference
-              PythonQtObjectPtr lookupCallable(PyObject* module, const QString& name);
+              PythonQtObjectPtr lookupCallable(PyObject* object, const QString& name);
               //@}

src/gui/PythonQtScriptingConsole.cpp +10 -1

@@ -173,7 +173,16 void PythonQtScriptingConsole::executeCode(const QString& code)
173	_stdOut = "";	173	_stdOut = "";
174	_stdErr = "";	174	_stdErr = "";
175	PythonQtObjectPtr p;	175	PythonQtObjectPtr p;
176	p.setNewRef(PyRun_String(code.toLatin1().data(), Py_single_input, PyModule_GetDict(_context), PyModule_GetDict(_context)));	176	PyObject* dict = NULL;
		177	if (PyModule_Check(_context)) {
		178	dict = PyModule_GetDict(_context);
		179	} else if (PyDict_Check(_context)) {
		180	dict = _context;
		181	}
		182	if (dict) {
		183	p.setNewRef(PyRun_String(code.toLatin1().data(), Py_single_input, dict, dict));
		184	}
		185
177	if (!p) {	186	if (!p) {
178	PythonQt::self()->handleError();	187	PythonQt::self()->handleError();
179	}	188	}

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages