1 files changed, 45 insertions, 4 deletions
diff --git a/sources/shiboken2/libshiboken/pep384impl.cpp b/sources/shiboken2/libshiboken/pep384impl.cpp
index 0baf6ed42..7cca03c84 100644
--- a/sources/shiboken2/libshiboken/pep384impl.cpp
+++ b/sources/shiboken2/libshiboken/pep384impl.cpp
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 #include "pep384impl.h"
-#include <autodecref.h>
+#include "autodecref.h"
 
 extern "C"
 {
@@ -398,7 +398,10 @@ PyRun_String(const char *str, int start, PyObject *globals, PyObject *locals)
     return ret;
 }
 
+#endif // Py_LIMITED_API
+
 // This is only a simple local helper that returns a computed variable.
+// Used also in Python 2.
 static PyObject *
 PepRun_GetResult(const char *command, const char *resvar)
 {
@@ -415,6 +418,8 @@ PepRun_GetResult(const char *command, const char *resvar)
     return res;
 }
 
+#ifdef Py_LIMITED_API
+
 /*****************************************************************************
  *
  * Support for classobject.h
@@ -497,15 +502,48 @@ static PyTypeObject *getFunctionType(void)
 
 PyTypeObject *PepStaticMethod_TypePtr = NULL;
 
-static PyTypeObject *getStaticMethodType(void)
+static PyTypeObject *
+getStaticMethodType(void)
 {
+    // this works for Python 3, only
+    //    "StaticMethodType = type(str.__dict__['maketrans'])\n";
     static const char prog[] =
-        "StaticMethodType = type(str.__dict__['maketrans'])\n";
-    return (PyTypeObject *) PepRun_GetResult(prog, "StaticMethodType");
+        "from xxsubtype import spamlist\n"
+        "StaticMethod_Type = type(spamlist.__dict__['staticmeth'])\n";
+    return (PyTypeObject *) PepRun_GetResult(prog, "StaticMethod_Type");
 }
 
+typedef struct {
+    PyObject_HEAD
+    PyObject *sm_callable;
+    PyObject *sm_dict;
+} staticmethod;
+
+PyObject *
+PyStaticMethod_New(PyObject *callable)
+{
+    staticmethod *sm = (staticmethod *)
+        PyType_GenericAlloc(PepStaticMethod_TypePtr, 0);
+    if (sm != NULL) {
+        Py_INCREF(callable);
+        sm->sm_callable = callable;
+    }
+    return (PyObject *)sm;
+}
 #endif // Py_LIMITED_API
 
+#if PY_VERSION_HEX < 0x03000000
+PyTypeObject *PepMethodDescr_TypePtr = NULL;
+
+static PyTypeObject *
+getMethodDescrType(void)
+{
+    static const char prog[] =
+        "MethodDescr_Type = type(str.split)\n";
+    return (PyTypeObject *) PepRun_GetResult(prog, "MethodDescr_Type");
+}
+#endif
+
 /*****************************************************************************
  *
  * Common newly needed functions
@@ -630,6 +668,9 @@ Pep384_Init()
     PepFunction_TypePtr = getFunctionType();
     PepStaticMethod_TypePtr = getStaticMethodType();
 #endif
+#if PY_VERSION_HEX < 0x03000000
+    PepMethodDescr_TypePtr = getMethodDescrType();
+#endif
 }
 
 } // extern "C"