Merge pull request pvieito#44 from philipturner/patch-4

Fix crash

Author: pvieito

PythonKit/Python.swift

@@ -1574,9 +1574,10 @@ extension PythonFunction : PythonConvertible {
             Unmanaged<PyFunction>.fromOpaque(funcPointer).release()
         })
 
-        let pyFuncPointer = PyCFunction_New(
+        let pyFuncPointer = PyCFunction_NewEx(
             PythonFunction.sharedMethodDefinition,
-            capsulePointer
+            capsulePointer,
+            nil
         )
 
         return PythonObject(consuming: pyFuncPointer)

PythonKit/PythonLibrary+Symbols.swift

@@ -59,8 +59,8 @@ let PyEval_GetBuiltins: @convention(c) () -> PyObjectPointer =
 let PyRun_SimpleString: @convention(c) (PyCCharPointer) -> Void =
     PythonLibrary.loadSymbol(name: "PyRun_SimpleString")
 
-let PyCFunction_New: @convention(c) (PyMethodDefPointer, UnsafeMutableRawPointer) -> PyObjectPointer =
-    PythonLibrary.loadSymbol(name: "PyCFunction_New")
+let PyCFunction_NewEx: @convention(c) (PyMethodDefPointer, UnsafeMutableRawPointer, UnsafeMutableRawPointer?) -> PyObjectPointer =
+    PythonLibrary.loadSymbol(name: "PyCFunction_NewEx")
 
 let PyCapsule_New: @convention(c) (UnsafeMutableRawPointer, UnsafePointer<CChar>?, PyCapsuleDestructor) -> PyObjectPointer =
     PythonLibrary.loadSymbol(name: "PyCapsule_New")

Tests/PythonKitTests/PythonRuntimeTests.swift

@@ -326,4 +326,22 @@ class PythonRuntimeTests: XCTestCase {
         }
         XCTAssertEqual(bytes, otherBytes)
     }
+    
+    func testPythonFunction() {
+        let versionMajor = Python.versionInfo.major
+        let versionMinor = Python.versionInfo.minor
+        guard (versionMajor == 3 && versionMinor >= 1) || versionMajor > 3 else {
+            return
+        }
+        
+        let pythonAdd = PythonFunction { (params: [PythonObject]) in
+            let lhs = params[0]
+            let rhs = params[1]
+            return lhs + rhs
+        }.pythonObject
+        
+        let pythonSum = pythonAdd(2, 3)
+        XCTAssertNotNil(Double(pythonSum))
+        XCTAssertEqual(pythonSum, 5)
+    }
 }