use PEP 484 typing hints where applicable

Author: radhermit

src/pkgcraft/dep/cpv.pyx

@@ -31,13 +31,13 @@ cdef class Cpv:
     pkgcraft.error.InvalidCpv: parsing failure: invalid cpv: >cat/pkg-1
     ...
     """
-    def __init__(self, str s not None):
+    def __init__(self, s: str):
         self.ptr = C.pkgcraft_cpv_new(s.encode())
         if self.ptr is NULL:
             raise InvalidCpv
 
     @staticmethod
-    def valid(str s not None, raised=False):
+    def valid(s: str, raised=False):
         """Determine if a string is a valid package Cpv.
 
         >>> from pkgcraft.dep import Cpv
@@ -203,7 +203,7 @@ cdef class Cpv:
         """
         return cstring_to_str(C.pkgcraft_cpv_cpn(self.ptr))
 
-    def matches(self, Restrict r not None):
+    def matches(self, r: Restrict):
         """Determine if a restriction matches a Cpv."""
         return C.pkgcraft_cpv_restrict_matches(self.ptr, r.ptr)
 
@@ -220,8 +220,7 @@ cdef class Cpv:
             return C.pkgcraft_cpv_intersects(self.ptr, (<Cpv>other).ptr)
         elif isinstance(other, Dep):
             return C.pkgcraft_cpv_intersects_dep(self.ptr, (<Dep>other).ptr)
-        else:
-            raise TypeError(f"{other.__class__.__name__!r} unsupported type")
+        raise TypeError(f"{other.__class__.__name__!r} unsupported type")
 
     def __lt__(self, other):
         if isinstance(other, Cpv):

src/pkgcraft/dep/pkg.pyx

@@ -28,7 +28,7 @@ class Blocker(IntEnum):
     Weak = C.BLOCKER_WEAK
 
     @staticmethod
-    def from_str(str s not None):
+    def from_str(s: str):
         blocker = C.pkgcraft_dep_blocker_from_str(s.encode())
         if blocker > 0:
             return Blocker(blocker)
@@ -49,7 +49,7 @@ class SlotOperator(IntEnum):
     Star = C.SLOT_OPERATOR_STAR
 
     @staticmethod
-    def from_str(str s not None):
+    def from_str(s: str):
         slot_op = C.pkgcraft_dep_slot_op_from_str(s.encode())
         if slot_op > 0:
             return SlotOperator(slot_op)
@@ -113,7 +113,7 @@ cdef class Dep:
         self._use_deps = SENTINEL
         self.eapi = EAPI_LATEST
 
-    def __init__(self, str s not None, /, eapi=None):
+    def __init__(self, s: str, /, eapi=None):
         if eapi is not None:
             self.eapi = Eapi._from_obj(eapi)
 
@@ -129,12 +129,12 @@ cdef class Dep:
         return obj
 
     @classmethod
-    def cached(cls, str s not None, eapi=None):
+    def cached(cls, s: str, eapi=None):
         """Return a cached Dep if one exists, otherwise return a new instance."""
         return _cached_dep(cls, s, eapi)
 
     @staticmethod
-    def valid(str s not None, eapi=None, raised=False):
+    def valid(s: str, eapi=None, raised=False):
         """Determine if a string is a valid package dependency.
 
         >>> from pkgcraft.dep import Dep
@@ -477,7 +477,7 @@ cdef class Dep:
         """
         return cstring_to_str(C.pkgcraft_dep_cpv(self.ptr))
 
-    def matches(self, Restrict r not None):
+    def matches(self, r: Restrict):
         """Determine if a restriction matches a package dependency."""
         return C.pkgcraft_dep_restrict_matches(self.ptr, r.ptr)
 
@@ -550,7 +550,7 @@ cdef class Dep:
 cdef class Cpn(Dep):
     """Unversioned Package dependency."""
 
-    def __init__(self, str s not None):
+    def __init__(self, s: str):
         self.ptr = C.pkgcraft_dep_new_cpn(s.encode())
         if self.ptr is NULL:
             raise InvalidDep

src/pkgcraft/dep/spec.pyx

@@ -46,7 +46,7 @@ cdef list iterable_to_dep_specs(object obj, C.DepSetKind kind):
 cdef class DepSpec:
     """Dependency object."""
 
-    def __init__(self, str s not None, /, eapi=None, set=DepSetKind.Dependencies):
+    def __init__(self, s: str, /, eapi=None, set=DepSetKind.Dependencies):
         cdef const C.Eapi *eapi_ptr = NULL
         cdef C.DepSetKind kind = DepSetKind(set)
 

src/pkgcraft/dep/version.pyx

@@ -16,7 +16,7 @@ class Operator(IntEnum):
     Greater = C.OPERATOR_GREATER
 
     @staticmethod
-    def from_str(str s not None):
+    def from_str(s: str):
         op = C.pkgcraft_version_op_from_str(s.encode())
         if op > 0:
             return Operator(op)
@@ -34,7 +34,7 @@ class Operator(IntEnum):
 cdef class Revision:
     """Package revision."""
 
-    def __init__(self, str s not None):
+    def __init__(self, s: str):
         self.ptr = C.pkgcraft_revision_new(s.encode())
         if self.ptr is NULL:
             raise InvalidVersion
@@ -126,13 +126,13 @@ cdef class Version:
     def __cinit__(self):
         self._revision = SENTINEL
 
-    def __init__(self, str s not None):
+    def __init__(self, s: str):
         self.ptr = C.pkgcraft_version_new(s.encode())
         if self.ptr is NULL:
             raise InvalidVersion
 
     @staticmethod
-    def valid(str s not None, raised=False):
+    def valid(s: str, raised=False):
         """Determine if a string is a valid package version.
 
         >>> from pkgcraft.dep import Version
@@ -204,7 +204,7 @@ cdef class Version:
             self._revision = Revision.from_ptr(ptr) if ptr is not NULL else None
         return self._revision
 
-    def intersects(self, Version other not None):
+    def intersects(self, other: Version):
         """Determine if two versions intersect.
 
         >>> from pkgcraft.dep import Version

src/pkgcraft/eapi.pyx

@@ -41,7 +41,7 @@ cdef get_eapis():
     return MappingProxyType(d)
 
 
-def eapi_range(str s not None):
+def eapi_range(s: str):
     """Convert EAPI range into an ordered set of Eapi objects.
 
     >>> from pkgcraft.eapi import *
@@ -114,7 +114,7 @@ cdef class Eapi(_IndirectInit):
         """Try to convert an object to an Eapi object."""
         return Eapi._from_obj(obj)
 
-    def has(self, str s not None):
+    def has(self, s: str):
         """Check if an EAPI has a given feature.
 
         See https://docs.rs/pkgcraft/latest/pkgcraft/eapi/enum.Feature.html for

src/pkgcraft/logging.pyx

@@ -34,7 +34,7 @@ cdef C.LogLevel convert_level(int level):
     return C.LOG_LEVEL_OFF
 
 
-def _pkgcraft_log_test(str message not None, int level):
+def _pkgcraft_log_test(message: str, int level):
     """Inject log messages into pkgcraft to replay for test purposes."""
     C.pkgcraft_log_test(message.encode(), convert_level(level))
 

src/pkgcraft/parse.pyx

@@ -2,23 +2,23 @@ from . cimport C
 from .error import PkgcraftError
 
 
-def category(str s not None, raised=False):
+def category(s: str, raised=False):
     """Determine if a string is a valid category name."""
     valid = C.pkgcraft_parse_category(s.encode()) is not NULL
     if not valid and raised:
         raise PkgcraftError
     return valid
 
 
-def package(str s not None, raised=False):
+def package(s: str, raised=False):
     """Determine if a string is a valid package name."""
     valid = C.pkgcraft_parse_package(s.encode()) is not NULL
     if not valid and raised:
         raise PkgcraftError
     return valid
 
 
-def repo(str s not None, raised=False):
+def repo(s: str, raised=False):
     """Determine if a string is a valid repo name."""
     valid = C.pkgcraft_parse_repo(s.encode()) is not NULL
     if not valid and raised:

src/pkgcraft/pkg/base.pyx

@@ -84,7 +84,7 @@ cdef class Pkg(_IndirectInit):
             self._version = self.cpv.version
         return self._version
 
-    def matches(self, Restrict r not None):
+    def matches(self, r: Restrict):
         """Determine if a restriction matches a package."""
         return C.pkgcraft_pkg_restrict_matches(self.ptr, r.ptr)
 

src/pkgcraft/repo/base.pyx

@@ -74,14 +74,14 @@ cdef class Repo:
         c_strs = C.pkgcraft_repo_categories(self.ptr, &length)
         return OrderedFrozenSet(CStringIter.create(c_strs, length))
 
-    def packages(self, str cat not None):
+    def packages(self, cat: str):
         """Get a repo's packages for a category."""
         cdef size_t length
         if parse.category(cat):
             c_strs = C.pkgcraft_repo_packages(self.ptr, cat.encode(), &length)
             return OrderedFrozenSet(CStringIter.create(c_strs, length))
 
-    def versions(self, str cat not None, str pkg not None):
+    def versions(self, cat: str, pkg: str):
         """Get a repo's versions for a package."""
         cdef size_t length
         if parse.category(cat) and parse.package(pkg):
@@ -175,7 +175,7 @@ cdef class Repo:
 cdef class _IterCpv:
     """Iterator over the Cpv objects from a repo."""
 
-    def __cinit__(self, Repo r not None):
+    def __cinit__(self, r: Repo):
         self.ptr = C.pkgcraft_repo_iter_cpv(r.ptr)
 
     def __iter__(self):
@@ -193,7 +193,7 @@ cdef class _IterCpv:
 cdef class _Iter:
     """Iterator over a repo."""
 
-    def __cinit__(self, Repo r not None):
+    def __cinit__(self, r: Repo):
         self.ptr = C.pkgcraft_repo_iter(r.ptr)
 
     def __iter__(self):
@@ -211,7 +211,7 @@ cdef class _Iter:
 cdef class _IterRestrict:
     """Iterator that applies a restriction over a repo iterator."""
 
-    def __cinit__(self, Repo repo not None, object obj not None):
+    def __cinit__(self, repo: Repo, object obj not None):
         cdef Restrict r = obj if isinstance(obj, Restrict) else Restrict(obj)
         self.ptr = C.pkgcraft_repo_iter_restrict(repo.ptr, r.ptr)
 

src/pkgcraft/repo/set.pyx

@@ -73,14 +73,14 @@ cdef class RepoSet:
         c_strs = C.pkgcraft_repo_set_categories(self.ptr, &length)
         return OrderedFrozenSet(CStringIter.create(c_strs, length))
 
-    def packages(self, str cat not None):
+    def packages(self, cat: str):
         """Get a repo set's packages for a category."""
         cdef size_t length
         if parse.category(cat):
             c_strs = C.pkgcraft_repo_set_packages(self.ptr, cat.encode(), &length)
             return OrderedFrozenSet(CStringIter.create(c_strs, length))
 
-    def versions(self, str cat not None, str pkg not None):
+    def versions(self, cat: str, pkg: str):
         """Get a repo set's versions for a package."""
         cdef size_t length
         if parse.category(cat) and parse.package(pkg):
@@ -261,7 +261,7 @@ cdef class RepoSet:
 cdef class _Iter:
     """Iterator over a repo set, optionally applying a restriction."""
 
-    def __cinit__(self, RepoSet s not None, obj=None):
+    def __cinit__(self, s: RepoSet, obj=None):
         cdef C.Restrict *restrict_ptr = NULL
         cdef Restrict r