COMP: Backport from patch-9 slicer

 add src/PythonQt_QtBindings.cpp
 add src/PythonQt_QtBindings.h

Author: hjmjohnson

src/PythonQt.cpp

@@ -258,6 +258,9 @@ void PythonQt::init(int flags, const QByteArray& pythonQtModuleName)
     PythonQtRegisterToolClassesTemplateConverterForKnownClass(QPen);
     PythonQtRegisterToolClassesTemplateConverterForKnownClass(QTextLength);
     PythonQtRegisterToolClassesTemplateConverterForKnownClass(QTextFormat);
+#if QT_VERSION < 0x060000
+    PythonQtRegisterToolClassesTemplateConverterForKnownClass(QMatrix);
+#endif
 
     PyObject* pack = PythonQt::priv()->packageByName("QtCore");
     PyObject* pack2 = PythonQt::priv()->packageByName("Qt");
@@ -321,6 +324,10 @@ void PythonQt::init(int flags, const QByteArray& pythonQtModuleName)
 void PythonQt::cleanup()
 {
   if (_self) {
+    // Remove signal handlers in advance, since destroying them calls back into
+    // PythonQt::priv()->removeSignalEmitter()
+    _self->removeSignalHandlers();
+
     delete _self;
     _self = nullptr;
   }
@@ -1548,6 +1555,10 @@ PythonQtClassInfo* PythonQtPrivate::currentClassInfoForClassWrapperCreation()
 
 void PythonQtPrivate::addDecorators(QObject* o, int decoTypes)
 {
+  if (!o)
+    {
+    return;
+    }
   o->setParent(this);
   int numMethods = o->metaObject()->methodCount();
   for (int i = 0; i < numMethods; i++) {
@@ -1841,7 +1852,13 @@ void PythonQt::initPythonQtModule(bool redirectStdOut, const QByteArray& pythonQ
   PythonQtObjectPtr sys;
   sys.setNewRef(PyImport_ImportModule("sys"));
 
-  if (redirectStdOut) {
+  if (redirectStdOut)
+  {
+    // Backup original 'sys.stdout' and 'sys.stderr'
+    PyModule_AddObject(sys, "pythonqt_original_stdout", PyObject_GetAttrString(sys, "stdout"));
+    PyModule_AddObject(sys, "pythonqt_original_stderr", PyObject_GetAttrString(sys, "stderr"));
+
+    // Create a redirection object for stdout and stderr
     PythonQtObjectPtr out;
     PythonQtObjectPtr err;
     // create a redirection object for stdout and stderr
@@ -1850,10 +1867,11 @@ void PythonQt::initPythonQtModule(bool redirectStdOut, const QByteArray& pythonQ
     err = PythonQtStdOutRedirectType.tp_new(&PythonQtStdOutRedirectType,nullptr, nullptr);
     ((PythonQtStdOutRedirect*)err.object())->_cb = stdErrRedirectCB;
     // replace the built in file objects with our own objects
-    PyModule_AddObject(sys, "stdout", out);
-    PyModule_AddObject(sys, "stderr", err);
-  }
+    PyModule_AddObject(sys, "pythonqt_stdout", out);
+    PyModule_AddObject(sys, "pythonqt_stderr", err);
 
+    setRedirectStdOutCallbackEnabled(redirectStdOut);
+  }
   // add PythonQt to the list of builtin module names
   PyObject *old_module_names = PyObject_GetAttrString(sys.object(),"builtin_module_names");
   if (old_module_names && PyTuple_Check(old_module_names)) {
@@ -1876,6 +1894,42 @@ void PythonQt::initPythonQtModule(bool redirectStdOut, const QByteArray& pythonQ
   Py_XDECREF(pyUnicodeObject);
 }
 
+bool PythonQt::redirectStdOutCallbackEnabled() const
+{
+  PythonQtObjectPtr sys;
+  sys.setNewRef(PyImport_ImportModule("sys"));
+
+  PythonQtObjectPtr pythonqt_stdout;
+  pythonqt_stdout.setNewRef(PyObject_GetAttrString(sys.object(), "pythonqt_stdout"));
+
+  PythonQtObjectPtr sys_stdout;
+  sys_stdout.setNewRef(PyObject_GetAttrString(sys.object(), "stdout"));
+
+  return PyObject_RichCompareBool(pythonqt_stdout.object(), sys_stdout.object(), Py_EQ);
+}
+
+void PythonQt::setRedirectStdOutCallbackEnabled(bool enabled)
+{
+  PythonQtObjectPtr sys;
+  sys.setNewRef(PyImport_ImportModule("sys"));
+
+  if (enabled) {
+    if( PyObject_HasAttrString(sys.object(), "pythonqt_stdout") ) {
+      PyModule_AddObject(sys.object(), "stdout", PyObject_GetAttrString(sys.object(), "pythonqt_stdout"));
+    }
+    if( PyObject_HasAttrString(sys.object(), "pythonqt_stderr") ) {
+      PyModule_AddObject(sys.object(), "stderr", PyObject_GetAttrString(sys.object(), "pythonqt_stderr"));
+    }
+  } else {
+    if( PyObject_HasAttrString(sys.object(), "pythonqt_original_stdout") ) {
+      PyModule_AddObject(sys.object(), "stdout", PyObject_GetAttrString(sys.object(), "pythonqt_original_stdout"));
+    }
+    if( PyObject_HasAttrString(sys.object(), "pythonqt_original_stderr") ) {
+      PyModule_AddObject(sys.object(), "stderr", PyObject_GetAttrString(sys.object(), "pythonqt_original_stderr"));
+    }
+  }
+}
+
 QString PythonQt::getReturnTypeOfWrappedMethod(PyObject* module, const QString& name)
 {
   QStringList tmp = name.split(".");

src/PythonQt.h

@@ -262,6 +262,18 @@ class PYTHONQT_EXPORT PythonQt : public QObject {
 
   //@}
 
+  //---------------------------------------------------------------------------
+  //! \name Standard output handling
+  //@{
+
+  //! return \a true if std out/err redirection is enabled.
+  bool redirectStdOutCallbackEnabled() const;
+
+  //! enable or disable std out/err redirection to pythonStdOut() and pythonStdErr() signals.
+  void setRedirectStdOutCallbackEnabled(bool enabled);
+
+  //@}
+
   //---------------------------------------------------------------------------
   //! \name Modules
   //@{
@@ -548,7 +560,7 @@ class PYTHONQT_EXPORT PythonQt : public QObject {
   //@{
 
   //! get access to internal data (should not be used on the public API, but is used by some C functions)
-  static PythonQtPrivate* priv() { return _self->_p; }
+  static PythonQtPrivate* priv() { return _self ? _self->_p : NULL; }
 
   //! clear all NotFound entries on all class infos, to ensure that
   //! newly loaded wrappers can add methods even when the object was wrapped by PythonQt before the wrapper was loaded

src/PythonQt_QtBindings.cpp

@@ -0,0 +1,73 @@
+
+#include "PythonQt_QtBindings.h"
+
+#include "PythonQt.h"
+
+void PythonQt_init_QtGui(PyObject*);
+void PythonQt_init_QtSvg(PyObject*);
+void PythonQt_init_QtSql(PyObject*);
+void PythonQt_init_QtNetwork(PyObject*);
+void PythonQt_init_QtCore(PyObject*);
+void PythonQt_init_QtWebKit(PyObject*);
+void PythonQt_init_QtOpenGL(PyObject*);
+void PythonQt_init_QtQml(PyObject*);
+void PythonQt_init_QtQuick(PyObject*);
+void PythonQt_init_QtXml(PyObject*);
+void PythonQt_init_QtXmlPatterns(PyObject*);
+void PythonQt_init_QtUiTools(PyObject*);
+void PythonQt_init_QtMultimedia(PyObject*);
+
+PYTHONQT_EXPORT void PythonQt_init_QtBindings()
+  {
+  #ifdef PYTHONQT_WRAP_Qtcore
+  PythonQt_init_QtCore(0);
+  #endif
+
+  #ifdef PYTHONQT_WRAP_Qtgui
+  PythonQt_init_QtGui(0);
+  #endif
+
+  #ifdef PYTHONQT_WRAP_Qtnetwork
+  PythonQt_init_QtNetwork(0);
+  #endif
+
+  #ifdef PYTHONQT_WRAP_Qtopengl
+  PythonQt_init_QtOpenGL(0);
+  #endif
+
+  #ifdef PYTHONQT_WRAP_Qtqml
+  PythonQt_init_QtQml(0);
+  #endif
+
+  #ifdef PYTHONQT_WRAP_Qtquick
+  PythonQt_init_QtQuick(0);
+  #endif
+
+  #ifdef PYTHONQT_WRAP_Qtsql
+  PythonQt_init_QtSql(0);
+  #endif
+
+  #ifdef PYTHONQT_WRAP_Qtsvg
+  PythonQt_init_QtSvg(0);
+  #endif
+
+  #ifdef PYTHONQT_WRAP_Qtuitools
+  PythonQt_init_QtUiTools(0);
+  #endif
+  
+  #ifdef PYTHONQT_WRAP_Qtmultimedia
+  PythonQt_init_QtMultimedia(0);
+  #endif
+
+  #ifdef PYTHONQT_WRAP_Qtwebkit
+  PythonQt_init_QtWebKit(0);
+  #endif
+
+  #ifdef PYTHONQT_WRAP_Qtxml
+  PythonQt_init_QtXml(0);
+  #endif
+
+  #ifdef PYTHONQT_WRAP_Qtxmlpatterns
+  PythonQt_init_QtXmlPatterns(0);
+  #endif
+  };

src/PythonQt_QtBindings.h

@@ -0,0 +1,10 @@
+#ifndef _PYTHONQT_QTBINDINGS_H
+#define _PYTHONQT_QTBINDINGS_H
+
+#include "PythonQtSystem.h"
+
+/// Initialize Qt bindings enabled at configuration time
+PYTHONQT_EXPORT void PythonQt_init_QtBindings();
+
+#endif
+