Python 3.4 compatibility (fixes #8)

tonyroberts · tonyroberts · commit 14591b62cb1d · 2014-09-15T13:07:07.000+01:00
diff --git a/pythonnet/src/runtime/interop.cs b/pythonnet/src/runtime/interop.cs
@@ -261,6 +261,9 @@ public static int magic() {
 #if (PYTHON26 || PYTHON27 || PYTHON32 || PYTHON33 || PYTHON34)
         /* Type attribute cache version tag. Added in version 2.6 */
 	    public static int tp_version_tag;
+#endif
+#if (PYTHON34)
+        public static int tp_finalize = 0;
 #endif
         // COUNT_ALLOCS adds some more stuff to PyTypeObject 
 #if (Py_COUNT_ALLOCS)
@@ -470,6 +473,8 @@ public static void FreeModuleDef(IntPtr ptr) {
     /// to good use as PythonNet specific flags (Managed and Subclass)
     /// </summary>
     internal class TypeFlags {
+#if (PYTHON23 || PYTHON24 || PYTHON25 || PYTHON26 || PYTHON27)
+        // these flags were removed in Python 3
         public static int HaveGetCharBuffer = (1 << 0);
         public static int HaveSequenceIn = (1 << 1);
         public static int GC = 0;
@@ -479,6 +484,7 @@ internal class TypeFlags {
         public static int HaveWeakRefs = (1 << 6);
         public static int HaveIter = (1 << 7);
         public static int HaveClass = (1 << 8);
+#endif
         public static int HeapType = (1 << 9);
         public static int BaseType = (1 << 10);
         public static int Ready = (1 << 12);
@@ -509,18 +515,31 @@ internal class TypeFlags {
         public static int BaseExceptionSubclass = (1 << 30);
         public static int TypeSubclass = (1 << 31);
 #endif
-        public static int Default = (HaveGetCharBuffer |
+
+// Default flags for Python 2
+#if (PYTHON23 || PYTHON24 || PYTHON25 || PYTHON26 || PYTHON27)
+        public static int Default = (
+                             HaveGetCharBuffer |
                              HaveSequenceIn |
                              HaveInPlaceOps |
                              HaveRichCompare |
                              HaveWeakRefs |
                              HaveIter |
                              HaveClass |
                              HaveStacklessExtension |
-#if (PYTHON25 || PYTHON26 || PYTHON27 || PYTHON32 || PYTHON33 || PYTHON34)
+    #if (PYTHON25 || PYTHON26 || PYTHON27)
                              HaveIndex | 
-#endif
+    #endif
                              0);
+#endif
+
+// Default flags for Python 3
+#if (PYTHON32 || PYTHON33 || PYTHON34)
+        public static int Default = (
+                            HaveStacklessExtension |
+                            HaveVersionTag);
+#endif
+
     }
 
 
diff --git a/pythonnet/src/runtime/methodwrapper.cs b/pythonnet/src/runtime/methodwrapper.cs
@@ -50,7 +50,7 @@ public MethodWrapper(Type type, string name) {
             Marshal.WriteIntPtr(mdef, (1 * IntPtr.Size), fp);
             Marshal.WriteIntPtr(mdef, (2 * IntPtr.Size), (IntPtr)0x0003); // METH_VARARGS | METH_KEYWORDS
             Marshal.WriteIntPtr(mdef, (3 * IntPtr.Size), IntPtr.Zero);
-            ptr = Runtime.PyCFunction_New(mdef, IntPtr.Zero);
+            ptr = Runtime.PyCFunction_NewEx(mdef, IntPtr.Zero, IntPtr.Zero);
         }
 
         public IntPtr Call(IntPtr args, IntPtr kw) {
diff --git a/pythonnet/src/runtime/runtime.cs b/pythonnet/src/runtime/runtime.cs
@@ -648,11 +648,6 @@ internal unsafe static extern IntPtr
         internal unsafe static extern IntPtr
         PyImport_ExecCodeModule(string name, IntPtr code);
 
-    [DllImport(Runtime.dll, CallingConvention=CallingConvention.Cdecl,
-        ExactSpelling=true, CharSet=CharSet.Ansi)]
-    internal unsafe static extern IntPtr
-    PyCFunction_New(IntPtr ml, IntPtr self);
-
     [DllImport(Runtime.dll, CallingConvention=CallingConvention.Cdecl,
         ExactSpelling=true, CharSet=CharSet.Ansi)]
     internal unsafe static extern IntPtr

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public MethodWrapper(Type type, string name) {`
`50`	`50`	`Marshal.WriteIntPtr(mdef, (1 * IntPtr.Size), fp);`
`51`	`51`	`Marshal.WriteIntPtr(mdef, (2 * IntPtr.Size), (IntPtr)0x0003); // METH_VARARGS \| METH_KEYWORDS`
`52`	`52`	`Marshal.WriteIntPtr(mdef, (3 * IntPtr.Size), IntPtr.Zero);`
`53`		`- ptr = Runtime.PyCFunction_New(mdef, IntPtr.Zero);`
	`53`	`+ ptr = Runtime.PyCFunction_NewEx(mdef, IntPtr.Zero, IntPtr.Zero);`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public IntPtr Call(IntPtr args, IntPtr kw) {`