Generator uses PySequence functions instead of PyTuple or PyList ones

2 files changed, 5 insertions, 4 deletions

diff --git a/cppgenerator.cpp b/cppgenerator.cpp
index a0de62bbe..2d25d2adb 100644
--- a/cppgenerator.cpp
+++ b/cppgenerator.cpp
@@ -715,7 +715,7 @@ void CppGenerator::writePolymorphicDecisor(QTextStream& s, PolymorphicData* pare
             if (polymorphicData->argType()->isContainer() &&
                 ((ContainerTypeEntry*)polymorphicData->argType()->typeEntry())->type()
                     == ContainerTypeEntry::PairContainer) {
-                s << " && PyTuple_GET_SIZE(" << pyArgName << ") == 2";
+                s << " && PySequence_Size(" << pyArgName << ") == 2";
             }
 
             if (signatureFound && varargs) {
diff --git a/shibokengenerator.cpp b/shibokengenerator.cpp
index c37791722..27e9f0f68 100644
--- a/shibokengenerator.cpp
+++ b/shibokengenerator.cpp
@@ -317,10 +317,11 @@ QString ShibokenGenerator::cpythonBaseName(const TypeEntry* type)
             case ContainerTypeEntry::VectorContainer:
             case ContainerTypeEntry::StackContainer:
             case ContainerTypeEntry::QueueContainer:
-                baseName = "PyList";
-                break;
+                //baseName = "PyList";
+                //break;
             case ContainerTypeEntry::PairContainer:
-                baseName = "PyTuple";
+                //baseName = "PyTuple";
+                baseName = "PySequence";
                 break;
             case ContainerTypeEntry::SetContainer:
                 baseName = "PySet";