GIT_REPOSITORIES/LPP/PythonQt Commit - r207:99eb8a233276

Fix __getattr__ problems.

Orochimarufan -

r207:99eb8a233276

parent child

Context file:

r207:99eb8a233276

Collapse all files

CMakeLists.txt +9 -5

             #-----------------------------------------------------------------------------
             # Find Python
             option(PythonQt_Python3 "Use Python 3.x (3.3+)" OFF)
-            if(PythonQt_Python3)
+            option(PythonQt_Python "Use specific Python Version" OFF)
-            	set(PythonQt_PythonMin 3.3)
+            if(PythonQt_Python)
-            else(PythonQt_Python3)
+            	find_package(Python ${PythonQt_Python} REQUIRED EXACT)
-            	set(PythonQt_PythonMin 2.6)
+            elseif(PythonQt_Python3)
+            	find_package(Python 3.3 REQUIRED)
+            else()
+            	find_package(Python 2.6 REQUIRED)
             endif()
-            find_package(Python ${PythonQt_PythonMin} REQUIRED)
             include_directories(${PYTHON_INCLUDE_DIRS})
             add_definitions(-DPYTHONQT_USE_RELEASE_PYTHON_FALLBACK)
+            #-----------------------------------------------------------------------------
+            # Core
             add_subdirectory(src)
             #-----------------------------------------------------------------------------

src/PythonQt.cpp +11 -8

                     Py_INCREF(obj);
                     PyModule_AddObject(pack2, names[i], obj);
                   } else {
-                    std::cerr << "method not found " << names[i];
+                    std::cerr << "method not found " << names[i] << std::endl;
                   }
                 }
               }
             };
             #ifdef PY3K
-            static PyModuleDef PythonQtModule = {
+            static PyModuleDef PythonQtModuleDef = {
               PyModuleDef_HEAD_INIT,
               "",
               NULL,
                 name = pythonQtModuleName;
               }
             #ifdef PY3K
-              PythonQtModule.m_name = name.constData();
+              PythonQtModuleDef.m_name = name.constData();
-              _p->_pythonQtModule = PyModule_Create(&PythonQtModule);
+              _p->_pythonQtModule = PyModule_Create(&PythonQtModuleDef);
             #else
               _p->_pythonQtModule = Py_InitModule(name.constData(), PythonQtMethods);
             #endif
               _p->_pythonQtModuleName = name;
+              PythonQtObjectPtr sys;
+              sys.setNewRef(PyImport_ImportModule("sys"));
               if (redirectStdOut) {
-                PythonQtObjectPtr sys;
                 PythonQtObjectPtr out;
                 PythonQtObjectPtr err;
-                sys.setNewRef(PyImport_ImportModule("sys"));
                 // create a redirection object for stdout and stderr
                 out = PythonQtStdOutRedirectType.tp_new(&PythonQtStdOutRedirectType,NULL, NULL);
                 ((PythonQtStdOutRedirect*)out.object())->_cb = stdOutRedirectCB;
               }
               // add PythonQt to the list of builtin module names
-              PythonQtObjectPtr sys;
-              sys.setNewRef(PyImport_ImportModule("sys"));
               PyObject *old_module_names = PyObject_GetAttrString(sys.object(),"builtin_module_names");
               Py_ssize_t old_size = PyTuple_Size(old_module_names);
               PyObject *module_names = PyTuple_New(old_size+1);
             #endif
               PyModule_AddObject(sys.object(),"builtin_module_names",module_names);
               Py_DecRef(old_module_names);
+            #ifdef PY3K
+              PyDict_SetItem(PyObject_GetAttrString(sys.object(), "modules"), PyUnicode_FromString(name.constData()), _p->_pythonQtModule.object());
+            #endif
             }
             QString PythonQt::getReturnTypeOfWrappedMethod(PyObject* module, const QString& name)

src/PythonQtClassWrapper.cpp +5 -5

               }
               // look in Python to support derived Python classes
-            #ifdef PY3K
-              return PyObject_GenericGetAttr(obj, name);
-            #else
               PyObject* superAttr = PyType_Type.tp_getattro(obj, name);
               if (superAttr) {
                 return superAttr;
               }
               // look for the internal methods (className(), help())
+            #ifdef PY3K
+              PyObject* internalMethod = PyObject_GenericGetAttr(obj, name);
+            #else
               PyObject* internalMethod = Py_FindMethod( PythonQtClassWrapper_methods, obj, (char*)attributeName);
+            #endif
               if (internalMethod) {
                 return internalMethod;
               }
               QString error = QString(wrapper->classInfo()->className()) + " has no attribute named '" + QString(attributeName) + "'";
               PyErr_SetString(PyExc_AttributeError, error.toLatin1().data());
               return NULL;
-            #endif
             }
             static int PythonQtClassWrapper_setattro(PyObject *obj,PyObject *name,PyObject *value)
 ,                   /* tp_weaklistoffset */
 ,                   /* tp_iter */
 ,                   /* tp_iternext */
-,                   /* tp_methods */
+                PythonQtClassWrapper_methods,                   /* tp_methods */
 ,                   /* tp_members */
 ,                         /* tp_getset */
 ,                         /* tp_base */

src/PythonQtConversion.cpp 0 -4

             #include <QTime>
             #include <QDate>
-            #if PY_MAJOR_VERSION >= 3
-            #define PY3K
-            #endif
             PythonQtValueStorage<qint64, 128>  PythonQtConv::global_valueStorage;
             PythonQtValueStorage<void*, 128>   PythonQtConv::global_ptrStorage;
             PythonQtValueStorageWithCleanup<QVariant, 128> PythonQtConv::global_variantStorage;

src/PythonQtImporter.cpp 0 -4

             #include <QFile>
             #include <QFileInfo>
-            #if PY_MAJOR_VERSION >= 3
-            #define PY3K
-            #endif
             #define IS_SOURCE   0x0
             #define IS_BYTECODE 0x1
             #define IS_PACKAGE  0x2

src/PythonQtInstanceWrapper.cpp +1 -5

             #include "PythonQtConversion.h"
             #include "PythonQtClassWrapper.h"
-            #if PY_MAJOR_VERSION >= 3
-            #define PY3K
-            #endif
             PythonQtClassInfo* PythonQtInstanceWrapperStruct::classInfo()
             {
               // take the class info from our type object
 ,                   /* tp_weaklistoffset */
 ,                   /* tp_iter */
 ,                   /* tp_iternext */
-,             /* tp_methods */
+                PythonQtInstanceWrapper_methods,             /* tp_methods */
 ,             /* tp_members */
 ,                         /* tp_getset */
 ,                         /* tp_base */

src/PythonQtSlot.cpp 0 -4

             #include <QByteArray>
-            #if PY_MAJOR_VERSION >= 3
-            #define PY3K
-            #endif
             #define PYTHONQT_MAX_ARGS 32

tests/PythonQtTests.cpp +17 -9

               QVERIFY(_helper->runScript("if obj.getPQCppObjectNoWrapAsValue().getH()==47: obj.setPassed();\n"));
               qRegisterMetaType<PQUnknownButRegisteredValueObject>("PQUnknownButRegisteredValueObject");
-              QVERIFY(_helper->runScript("a = obj.getUnknownButRegisteredValueObjectAsPtr();print a;\nif a!=None: obj.setPassed();\n"));
+              QVERIFY(_helper->runScript("a = obj.getUnknownButRegisteredValueObjectAsPtr();print (a);\nif a!=None: obj.setPassed();\n"));
-              QVERIFY(_helper->runScript("a = obj.getUnknownButRegisteredValueObjectAsValue();print a;\nif a!=None: obj.setPassed();\n"));
+              QVERIFY(_helper->runScript("a = obj.getUnknownButRegisteredValueObjectAsValue();print (a);\nif a!=None: obj.setPassed();\n"));
-              QVERIFY(_helper->runScript("a = obj.getUnknownValueObjectAsPtr();print a;\nif a!=None: obj.setPassed();\n"));
+              QVERIFY(_helper->runScript("a = obj.getUnknownValueObjectAsPtr();print (a);\nif a!=None: obj.setPassed();\n"));
               QEXPECT_FAIL("", "Testing by value return without the object being registered as QMetaType or having registered a default constructor decorator", Continue);
-              QVERIFY(_helper->runScript("a = obj.getUnknownValueObjectAsValue();print a;\nif a!=None: obj.setPassed();\n"));
+              QVERIFY(_helper->runScript("a = obj.getUnknownValueObjectAsValue();print (a);\nif a!=None: obj.setPassed();\n"));
               // expect to get strict call to double overload
               QVERIFY(_helper->runScript("obj.testNoArg()\nfrom PythonQt.private import PQCppObjectNoWrap\na = PQCppObjectNoWrap(22.2)\nif a.getH()==2: obj.setPassed();\n"));
               // expect to get un-strict call to double overload
               QVERIFY(_helper->runScript("obj.testNoArg()\nfrom PythonQt.private import PQCppObjectNoWrap\na = PQCppObjectNoWrap(22)\nif a.getH()==2: obj.setPassed();\n"));
               // expect to get strict call to copy constructor overload
-              QVERIFY(_helper->runScript("obj.testNoArg()\nfrom PythonQt.private import PQCppObjectNoWrap\na = PQCppObjectNoWrap(PQCppObjectNoWrap())\nprint a.getH()\nif a.getH()==1: obj.setPassed();\n"));
+              QVERIFY(_helper->runScript("obj.testNoArg()\nfrom PythonQt.private import PQCppObjectNoWrap\na = PQCppObjectNoWrap(PQCppObjectNoWrap())\nprint (a.getH())\nif a.getH()==1: obj.setPassed();\n"));
               // test decorated enums
               // already registered by signals test
               //PythonQt::self()->registerCPPClass("PQCppObject2",NULL,NULL, PythonQtCreateObject<PQCppObject2Decorator>);
               // local enum (decorated)
-              QVERIFY(_helper->runScript("obj.testNoArg()\nfrom PythonQt.private import PQCppObject2\na = PQCppObject2()\nprint a.testEnumFlag1\nif a.testEnumFlag1(PQCppObject2.TestEnumValue2)==PQCppObject2.TestEnumValue2: obj.setPassed();\n"));
+              QVERIFY(_helper->runScript("obj.testNoArg()\nfrom PythonQt.private import PQCppObject2\na = PQCppObject2()\nprint (a.testEnumFlag1)\nif a.testEnumFlag1(PQCppObject2.TestEnumValue2)==PQCppObject2.TestEnumValue2: obj.setPassed();\n"));
               // enum with namespace (decorated)
               QVERIFY(_helper->runScript("obj.testNoArg()\nfrom PythonQt.private import PQCppObject2\na = PQCppObject2()\nif a.testEnumFlag2(PQCppObject2.TestEnumValue2)==PQCppObject2.TestEnumValue2: obj.setPassed();\n"));
               // with int overload to check overloading
             {
               connect(PythonQt::self(), SIGNAL(pythonStdOut(const QString&)), _helper, SLOT(stdOut(const QString&)));
               connect(PythonQt::self(), SIGNAL(pythonStdErr(const QString&)), _helper, SLOT(stdErr(const QString&)));
-              PyRun_SimpleString("print 'test'\n");
+              PyRun_SimpleString("print ('test')\n");
             }
             void PythonQtTestApiHelper::stdOut(const QString& s)
             {
-              qDebug() << s;
+              outBuf.append(s);
+              QStringList x = outBuf.split("\n");
+              outBuf = x.takeLast();
+              foreach(QString s, x)
+                qDebug() << s;
             }
             void PythonQtTestApiHelper::stdErr(const QString& s)
             {
-              qDebug() << s;
+              errBuf.append(s);
+              QStringList x = errBuf.split("\n");
+              errBuf = x.takeLast();
+              foreach(QString s, x)
+                qDebug() << s;
             }
             QObject* PythonQtTestCppFactory::create(const QByteArray& name, void *ptr)

tests/PythonQtTests.h +2 0

               void stdErr(const QString&);
             private:
+              QString outBuf;
+              QString errBuf;
               bool _passed;
             };

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