pkg: merge Keyword.from_ptr() and Keyword.__init__()

pkgcraft · Jun 18, 2024 · 7a0c881 · 7a0c881
1 parent 84e22d2
commit 7a0c881
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/pkgcraft/pkg/ebuild.pxd b/src/pkgcraft/pkg/ebuild.pxd
@@ -38,7 +38,7 @@ cdef class Keyword:
     cdef int _hash
 
     @staticmethod
-    cdef Keyword from_ptr(C.Keyword *)
+    cdef Keyword from_ptr(C.Keyword *, Keyword inst=*)
 
 
 cdef class Maintainer(Indirect):

diff --git a/src/pkgcraft/pkg/ebuild.pyx b/src/pkgcraft/pkg/ebuild.pyx
@@ -251,14 +251,13 @@ cdef class Keyword:
         if ptr is NULL:
             raise PkgcraftError
 
-        self.status = KeywordStatus(ptr.status)
-        self.arch = ptr.arch.decode()
-        self.ptr = ptr
+        Keyword.from_ptr(ptr, self)
 
     @staticmethod
-    cdef Keyword from_ptr(C.Keyword *ptr):
+    cdef Keyword from_ptr(C.Keyword *ptr, Keyword inst = None):
         """Create a Keyword from a pointer."""
-        inst = <Keyword>Keyword.__new__(Keyword)
+        if inst is None:
+            inst = <Keyword>Keyword.__new__(Keyword)
         inst.status = KeywordStatus(ptr.status)
         inst.arch = ptr.arch.decode()
         inst.ptr = ptr