wip

Signed-off-by: Jan Kowalleck <[email protected]>

Author: jkowalleck

cyclonedx/_internal/type.py

@@ -28,7 +28,6 @@
 from random import random
 from typing import TYPE_CHECKING, Any, Literal, Optional, Union, overload
 
-from .._internal.type import is_not_none
 from ..schema import OutputFormat, SchemaVersion
 
 if TYPE_CHECKING:  # pragma: no cover
@@ -176,12 +175,12 @@ def from_bom(cls, bom: 'Bom', prefix: str = 'BomRef') -> 'BomRefDiscriminator':
         components = tuple(bom._get_all_components())
         services = tuple(bom.services)
         vulnerabilities = tuple(bom.vulnerabilities)
-        orgs: tuple['OrganizationalEntity', ...] = tuple(filter(is_not_none, chain(  # type:ignore[arg-type]
+        orgs: Iterable['OrganizationalEntity'] = filter(lambda o: o is not None, chain(  # type:ignore[arg-type]
             (bom.metadata.manufacture, bom.metadata.manufacturer, bom.metadata.supplier),
             chain.from_iterable((c.manufacturer, c.supplier,) for c in components),
             (s.provider for s in services),
             chain.from_iterable(v.credits.organizations for v in vulnerabilities if v.credits),
-        )))
+        ))
         licenses: Iterable['License'] = chain(
             bom.metadata.licenses,
             chain.from_iterable(c.licenses for c in components),