Fix: remove PyTuple#getRawItem (#30)

spiraldb · Sep 5, 2023 · d12b784 · d12b784
1 parent ab60cf3
commit d12b784
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/pydust/src/pytypes.zig b/pydust/src/pytypes.zig
@@ -251,7 +251,7 @@ fn Init(comptime name: [:0]const u8, comptime definition: type, comptime Instanc
                 return null;
             }
 
-            const tuple = py.PyTuple{ .obj = .{ .py = args } };
+            const tuple: py.PyTuple = .{ .obj = .{ .py = args } };
             const argsSize = tuple.getSize() catch return null;
             const argLen = @typeInfo(@typeInfo(initSig.argsParam.?.type.?).Pointer.child).Struct.fields.len;
             if (argsSize != argLen) {
@@ -261,7 +261,8 @@ fn Init(comptime name: [:0]const u8, comptime definition: type, comptime Instanc
 
             var pyArgs: []*ffi.PyObject = py.allocator.alloc(*ffi.PyObject, argLen) catch return null;
             for (0..argLen) |i| {
-                pyArgs[i] = tuple.getRawItem(@intCast(i)) catch return null;
+                const item = tuple.getItem(@intCast(i)) catch return null;
+                pyArgs[i] = item.py;
             }
 
             return pyArgs;

diff --git a/pydust/src/types/tuple.zig b/pydust/src/types/tuple.zig
@@ -38,14 +38,6 @@ pub const PyTuple = extern struct {
         }
     }
 
-    pub fn getRawItem(self: *const PyTuple, idx: isize) !*ffi.PyObject {
-        if (ffi.PyTuple_GetItem(self.obj.py, @intCast(idx))) |item| {
-            return item;
-        } else {
-            return PyError.Propagate;
-        }
-    }
-
     /// Insert a reference to object o at position pos of the tuple.
     ///
     /// Warning: steals a reference to value.