From 4d918d73e94c2fea125107369a650dff99513e0c Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Thu, 3 Sep 2020 10:54:59 +0200
Subject: Further cleanups of Python2 in C++ code

Task-number: PYSIDE-1339
Task-number: PYSIDE-904
Change-Id: I8b192651abe1344c1240b9867c82e558d952769f
Reviewed-by: Christian Tismer <tismer@stackless.com>
---
 sources/pyside2/PySide2/QtCore/typesystem_core_win.xml | 12 ++----------
 sources/pyside2/PySide2/glue/qtcore.cpp                |  8 --------
 sources/pyside2/PySide2/templates/core_common.xml      |  4 ----
 3 files changed, 2 insertions(+), 22 deletions(-)

(limited to 'sources/pyside2')

diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_win.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_win.xml
index 8e3fa6f5e..6a0e1087e 100644
--- a/sources/pyside2/PySide2/QtCore/typesystem_core_win.xml
+++ b/sources/pyside2/PySide2/QtCore/typesystem_core_win.xml
@@ -49,22 +49,14 @@
       <include file-name="wtypes.h" location="global"/>
       <conversion-rule>
         <native-to-target>
-        #ifdef IS_PY3K
-        return PyCapsule_New(%in, 0, 0);
-        #else
-        return PyCObject_FromVoidPtr(%in, 0);
-        #endif
+        return PyCapsule_New(%in, nullptr, nullptr);
         </native-to-target>
         <target-to-native>
             <add-conversion type="PyNone">
             %out = 0;
             </add-conversion>
             <add-conversion check="checkPyCapsuleOrPyCObject(%in)" type="PyObject">
-            #ifdef IS_PY3K
-            %out = (%OUTTYPE)PyCapsule_GetPointer(%in, 0);
-            #else
-            %out = (%OUTTYPE)PyCObject_AsVoidPtr(%in);
-            #endif
+            %out = (%OUTTYPE)PyCapsule_GetPointer(%in, nullptr);
             </add-conversion>
         </target-to-native>
       </conversion-rule>
diff --git a/sources/pyside2/PySide2/glue/qtcore.cpp b/sources/pyside2/PySide2/glue/qtcore.cpp
index cf87cfc96..d35a73289 100644
--- a/sources/pyside2/PySide2/glue/qtcore.cpp
+++ b/sources/pyside2/PySide2/glue/qtcore.cpp
@@ -1674,14 +1674,6 @@ PyMem_Free(temp);
 #endif
 // @snippet conversion-pyunicode
 
-// @snippet conversion-pystring
-#ifndef IS_PY3K
-const char * str = %CONVERTTOCPP[const char *](%in);
-//XXX      /|\ omitting this space crashes shiboken!
-%out = %OUTTYPE(str);
-#endif
-// @snippet conversion-pystring
-
 // @snippet conversion-pynone
 %out = %OUTTYPE();
 // @snippet conversion-pynone
diff --git a/sources/pyside2/PySide2/templates/core_common.xml b/sources/pyside2/PySide2/templates/core_common.xml
index 136d1f79a..a7c9eca3d 100644
--- a/sources/pyside2/PySide2/templates/core_common.xml
+++ b/sources/pyside2/PySide2/templates/core_common.xml
@@ -343,11 +343,7 @@
     <template name="checkPyCapsuleOrPyCObject_func">
     static bool checkPyCapsuleOrPyCObject(PyObject* pyObj)
     {
-        #ifdef IS_PY3K
         return PyCapsule_CheckExact(pyObj);
-        #else
-        return PyCObject_Check(pyObj);
-        #endif
     }
     </template>
 
-- 
cgit v1.2.3