helpers and pythonic

Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>

Author: jkowalleck

cyclonedx/model/bom.py

@@ -292,7 +292,7 @@ def manufacture(self, manufacture: Optional[OrganizationalEntity]) -> None:
               we should set this data on `.component.manufacturer`.
         """
         if manufacture is not None:
-            warn(*DeprecationWarning1Dot6._prepw('bom.metadata.manufacture', 'bom.metadata.component.manufacturer'))
+            DeprecationWarning1Dot6._warn('bom.metadata.manufacture', 'bom.metadata.component.manufacturer')
         self._manufacture = manufacture
 
     @property

cyclonedx/model/component.py

@@ -1186,7 +1186,7 @@ def author(self) -> Optional[str]:
     @author.setter
     def author(self, author: Optional[str]) -> None:
         if author is not None:
-            warn(*DeprecationWarning1Dot6._prepw('@.author', '@.authors` or `@.manufacturer'))
+            DeprecationWarning1Dot6._warn('@.author', '@.authors` or `@.manufacturer')
         self._author = author
 
     @property
@@ -1467,7 +1467,7 @@ def modified(self) -> bool:
     @modified.setter
     def modified(self, modified: bool) -> None:
         if modified:
-            warn(*DeprecationWarning1Dot3._prepw('@.modified', '@.pedigree'))
+            DeprecationWarning1Dot3._warn('@.modified', '@.pedigree')
         self._modified = modified
 
     @property

cyclonedx/model/tool.py

@@ -241,7 +241,7 @@ def tools(self) -> 'SortedSet[Tool]':
     @tools.setter
     def tools(self, tools: Iterable[Tool]) -> None:
         if tools:
-            warn(*DeprecationWarning1Dot5._prepw('@.tools', '@.components` and `@.services'))
+            DeprecationWarning1Dot5._warn('@.tools', '@.components` and `@.services')
         self._tools = SortedSet(tools)
 
     def __len__(self) -> int:

cyclonedx/schema/deprecation.py

@@ -17,6 +17,7 @@
 
 from abc import ABC
 from typing import ClassVar, Optional
+from warnings import warn
 
 from . import SchemaVersion
 
@@ -36,19 +37,13 @@ class SchemaDeprecationWarning(DeprecationWarning, ABC):
     SCHEMA_VERSION: ClassVar[SchemaVersion]
 
     @classmethod
-    def _prepw(cls, deprecated: str, instead: Optional[str] = None) -> tuple[str, type[SchemaDeprecationWarning]]:
-        """Prepare the warning message and category for schema deprecations.
-
-        Internal API. Not part of the public interface.
-
-        Intended to be used as:
-
-            warnings.warn(*SchemaDeprecationWarning._prepw("foo", "bar"))
-        """
-        w = f'`{deprecated}` is deprecated from CycloneDX v{cls.SCHEMA_VERSION.to_version()} onwards.'
-        if instead is not None:
-            w += f' Please use `{instead}` instead.'
-        return w, cls
+    def _warn(cls, deprecated: str, instead: Optional[str] = None,
+              *, stacklevel: int = 1) -> None:
+        """Internal API. Not part of the public interface."""
+        msg = f'`{deprecated}` is deprecated from CycloneDX v{cls.SCHEMA_VERSION.to_version()} onwards.'
+        if instead:
+            msg += f' Please use `{instead}` instead.'
+        warn(msg, cls, stacklevel=stacklevel + 1)
 
 
 class DeprecationWarning1Dot7(SchemaDeprecationWarning):