Testing (#28)

* Delete PyEncodable.swift

* pycall generics update

* PyCall updates

* ...

* Update Package.swift

* pycall fixes

* PyPointer is no longer considered a PyDecodable, since it caused issues with the generics PyCall handlers, and a independent -> PyPointer already existed to handle cases where raw PyPointer is the return value.

* Fix of the issue where "as Void" was needed because swift compiler couldn't tell apart if PyPointer or Void was returned, functions with -> PyPointer have now been marked with "@_disfavoredOverload" which makes swift compiler pick the other 2 options before this, and return type PyPointer must be used to force this version over the others.

* python standard lib added to tests

* Update PythonSwiftCoreTests.swift

---------

Co-authored-by: psychowaspx <[email protected]>

Package.swift

@@ -48,6 +48,11 @@ let package = Package(
 //        )
         .testTarget(
             name: "PythonSwiftCoreTests",
-            dependencies: ["PythonSwiftCore","PythonLib"]),
+            dependencies: ["PythonSwiftCore","PythonLib"],
+            resources: [
+                .copy("python_stdlib")
+            ]
+        ),
+
     ]
 )

Sources/PythonSwiftCore/PyCast+PyUnpack.swift

@@ -20,6 +20,26 @@ public func pyCast<R: ConvertibleFromPython>(from o: PyPointer?) throws -> R {
     return try R(object: object)
 }
 
+@inlinable
+public func UnPackPyPointer<T: AnyObject>(from o: PyPointer?) -> T {
+    guard
+        let object = o, object != PythonNone,
+        let pointee = unsafeBitCast(o, to: PySwiftObjectPointer.self)?.pointee
+    else { fatalError() }
+
+    return Unmanaged.fromOpaque(pointee.swift_ptr).takeUnretainedValue()
+}
+
+@inlinable
+public func UnPackOptionalPyPointer<T: AnyObject>(from o: PyPointer?) -> T? {
+    guard
+        let object = o, object != PythonNone,
+        let pointee = unsafeBitCast(o, to: PySwiftObjectPointer.self)?.pointee
+    else { return nil }
+
+    return Unmanaged.fromOpaque(pointee.swift_ptr).takeUnretainedValue()
+}
+
 
 @inlinable
 public func UnPackOptionalPyPointer<T: AnyObject>(with check: PythonType, from self: PyPointer, as: T.Type) -> T? {

Sources/PythonSwiftCore/PyDecodable.swift

@@ -12,11 +12,11 @@ import PythonLib
 //    }
 //    
 //}
-
+//
 extension PyPointer : PyDecodable {
 
     public init(object: PyPointer) throws {
-        self = object.xINCREF
+        self = object
     }
 
 
@@ -213,6 +213,23 @@ extension Array : PyDecodable where Element : PyDecodable {
 
 }
 
+extension Dictionary: PyDecodable where Key == String, Value == PyPointer {
+    public init(object: PyPointer) throws {
+        var d: [Key:Value] = .init()
+        var pos: Int = 0
+        var key: PyPointer?
+        var value: PyPointer?
+        while PyDict_Next(object, &pos, &key, &value) == 1 {
+            if let k = key {
+                d[try String(object: k)] = value
+            }
+        }
+
+        self = d
+    }
+
+
+}
 
 
 

Sources/PythonSwiftCore/PyDict.swift

@@ -62,6 +62,15 @@ public func PyDict_SetItem(_ dict: PyPointer?, _ key: String, _ value: PyPointer
     key.withCString { PyDict_SetItemString(dict, $0, value) }
 }
 
+public func PyDict_SetItem_Reduced(_ dict: PyPointer,_ next:  Dictionary<String, PyPointer>.Element) -> PyPointer {
+    _ = next.key.withCString { PyDict_SetItemString(dict, $0, next.value) }
+    return dict
+}
+public func PyDict_SetItem_ReducedIncRef(_ dict: PyPointer,_ next:  Dictionary<String, PyPointer>.Element) -> PyPointer {
+    _ = next.key.withCString { PyDict_SetItemString(dict, $0, next.value.xINCREF) }
+    return dict
+}
+
 @discardableResult
 public func PyDict_SetItem(_ dict: PyPointer?, _ key: String, _ value: PyEncodable) -> Int32 {
     key.withCString { PyDict_SetItemString(dict, $0, value.pyPointer) }

Sources/PythonSwiftCore/PyEncodable.swift

@@ -374,5 +374,7 @@ extension Dictionary: PyEncodable where Key == StringLiteralType, Value == PyEnc
 
 }
 
-
+public extension Dictionary where Key == String, Value == PyPointer {
+    var pyDict: PyPointer { self.reduce(PyDict_New()!, PyDict_SetItem_ReducedIncRef) }
+}