eapi: simplify Eapi.from_ptr() creating new instances for every call

Author: radhermit

src/pkgcraft/eapi.pxd

@@ -14,7 +14,7 @@ cdef class Eapi(Indirect):
     cdef int _hash
 
     @staticmethod
-    cdef Eapi from_ptr(const C.Eapi *, bint init=*)
+    cdef Eapi from_ptr(const C.Eapi *)
 
     @staticmethod
     cdef Eapi _from_obj(object)

src/pkgcraft/eapi.pyx

@@ -17,7 +17,7 @@ cdef get_official_eapis():
     """Get the mapping of all official EAPIs."""
     cdef size_t length
     c_eapis = C.pkgcraft_eapis_official(&length)
-    eapis = [Eapi.from_ptr(c_eapis[i], init=True) for i in range(length)]
+    eapis = [Eapi.from_ptr(c_eapis[i]) for i in range(length)]
     d = {str(eapi): eapi for eapi in eapis}
     C.pkgcraft_array_free(<void **>c_eapis, length)
 
@@ -34,7 +34,7 @@ cdef get_eapis():
     cdef size_t length
     d = EAPIS_OFFICIAL.copy()
     c_eapis = C.pkgcraft_eapis(&length)
-    eapis = [Eapi.from_ptr(c_eapis[i], init=True) for i in range(len(d), length)]
+    eapis = [Eapi.from_ptr(c_eapis[i]) for i in range(len(d), length)]
     globals()['EAPI_LATEST'] = eapis[-1]
     d.update((str(eapi), eapi) for eapi in eapis)
     C.pkgcraft_array_free(<void **>c_eapis, length)
@@ -80,18 +80,11 @@ cpdef OrderedFrozenSet eapi_range(s: str):
 cdef class Eapi(Indirect):
 
     @staticmethod
-    cdef Eapi from_ptr(const C.Eapi *ptr, bint init=False):
+    cdef Eapi from_ptr(const C.Eapi *ptr):
         """Create an Eapi object from a pointer."""
-        cdef Eapi eapi
-
-        if init:
-            eapi = <Eapi>Eapi.__new__(Eapi)
-            eapi.ptr = ptr
-        else:
-            id = cstring_to_str(C.pkgcraft_eapi_as_str(ptr))
-            eapi = EAPIS[id]
-
-        return eapi
+        inst = <Eapi>Eapi.__new__(Eapi)
+        inst.ptr = ptr
+        return inst
 
     @staticmethod
     cdef Eapi _from_obj(object obj):

tests/pkg/base.py

@@ -19,7 +19,7 @@ def test_cpv_base(self, repo):
         assert pkg.cpv == Cpv("cat/pkg-1-r2")
 
     def test_eapi_base(self, pkg):
-        assert pkg.eapi is EAPI_LATEST_OFFICIAL
+        assert pkg.eapi == EAPI_LATEST_OFFICIAL
 
     def test_repo(self, pkg, repo):
         assert pkg.repo == repo

tests/pkg/test_ebuild.py

@@ -31,9 +31,9 @@ class TestEbuildPkg(BasePkgTests):
     def test_eapi(self, ebuild_repo):
         EAPI_PREV_OFFICIAL = list(EAPIS_OFFICIAL.values())[-2]
         pkg = ebuild_repo.create_pkg("cat/pkg-1", eapi=EAPI_PREV_OFFICIAL)
-        assert pkg.eapi is EAPI_PREV_OFFICIAL
+        assert pkg.eapi == EAPI_PREV_OFFICIAL
         pkg = ebuild_repo.create_pkg("cat/pkg-1", eapi=EAPI_LATEST_OFFICIAL)
-        assert pkg.eapi is EAPI_LATEST_OFFICIAL
+        assert pkg.eapi == EAPI_LATEST_OFFICIAL
 
     def test_intersects(self, make_ebuild_repo):
         repo = make_ebuild_repo(id="test")

tests/repo/test_ebuild.py

@@ -90,12 +90,12 @@ def test_eapi(self, make_raw_ebuild_repo):
         # defaults to latest EAPI
         repo = make_raw_ebuild_repo()
         r = EbuildRepo(repo.path)
-        assert r.eapi is EAPI_LATEST_OFFICIAL
+        assert r.eapi == EAPI_LATEST_OFFICIAL
 
         # explicitly force latest EAPI
         repo = make_raw_ebuild_repo(eapi=EAPI_LATEST_OFFICIAL)
         r = EbuildRepo(repo.path)
-        assert r.eapi is EAPI_LATEST_OFFICIAL
+        assert r.eapi == EAPI_LATEST_OFFICIAL
 
     def test_masters(self):
         primary = TEST_DATA.repos["primary"]