wip

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

Author: jkowalleck

cyclonedx_py/_internal/utils/packaging.py

@@ -50,8 +50,7 @@ def metadata2licenses(metadata: 'PackageMetadata', lfac: 'LicenseFactory',
             # see spec: https://packaging.python.org/en/latest/specifications/core-metadata/#license
             if len(mlicense) <= 0:
                 continue
-            license = lfac.make_from_string(mlicense,
-                                            license_acknowledgement=lack)
+            license = lfac.make_from_string(mlicense, license_acknowledgement=lack)
             if isinstance(license, DisjunctiveLicense) and license.id is None:
                 if gather_texts:
                     # per spec, `License` is either a SPDX ID/Expression, or a license text(not name!)

cyclonedx_py/_internal/utils/pep621.py

@@ -37,6 +37,7 @@
 
 from .cdx import url_label_to_ert
 from .license_trove_classifier import is_license_trove, license_trove2spdx
+from .mimetypes import guess_type
 
 if TYPE_CHECKING:
     from cyclonedx.factory.license import LicenseFactory
@@ -73,22 +74,30 @@ def project2licenses(project: dict[str, Any], lfac: 'LicenseFactory',
         if gather_text and 'file' in plicense:
             # Per PEP 621 spec:
             # > [...] a string value that is a relative file path [...].
-            # > Tools MUST assume the file’s encoding is UTF-8.
-            # But in reality, we found non-printable bytes in some files!
             with open(join(dirname(fpath), *PurePosixPath(plicense['file']).parts), 'rb') as plicense_fileh:
-                yield DisjunctiveLicense(name=f"declared license of '{project['name']}'",
-                                         acknowledgement=lack,
-                                         text=AttachedText(encoding=Encoding.BASE_64,
-                                                           content=b64encode(plicense_fileh.read()).decode()))
+                content_type = guess_type(plicense_fileh.name) or AttachedText.DEFAULT_CONTENT_TYPE
+                yield DisjunctiveLicense(
+                    name=f"declared license of '{project['name']}'",
+                    acknowledgement=lack,
+                    text=AttachedText(
+                        content_type=content_type,
+                        encoding=Encoding.BASE_64,
+                        # Per PEP 621 spec:
+                        # > Tools MUST assume the file’s encoding is UTF-8.
+                        # But in reality, we found non-printable bytes in some files!
+                        content=b64encode(
+                            plicense_fileh.read()
+                        ).decode('ascii')))
         elif len(plicense_text := plicense.get('text', '')) > 0:
             license = lfac.make_from_string(plicense_text,
                                             license_acknowledgement=lack)
             if isinstance(license, DisjunctiveLicense) and license.id is None:
                 if gather_text:
                     # per spec, `License` is either a SPDX ID/Expression, or a license text(not name!)
-                    yield DisjunctiveLicense(name=f"declared license of '{project['name']}'",
-                                             acknowledgement=lack,
-                                             text=AttachedText(content=plicense_text))
+                    yield DisjunctiveLicense(
+                        name=f"declared license of '{project['name']}'",
+                        acknowledgement=lack,
+                        text=AttachedText(content=plicense_text))
             else:
                 yield license
     # Silently skip any other types (including string/PEP 639)

cyclonedx_py/_internal/utils/pep639.py

@@ -108,16 +108,16 @@ def dist2licenses_from_files(
 def _make_license_from_content(file_name: str, content: Union[str, bytes],
                                lack: 'LicenseAcknowledgement') -> DisjunctiveLicense:
     content_type = guess_type(file_name) or AttachedText.DEFAULT_CONTENT_TYPE
-    # Per PEP 639 spec, license files are human-readable texts.
-    # But in reality, we found non-printable bytes in some files!
-    encoding = Encoding.BASE_64
-    content_s = b64encode(
-        content
-        if isinstance(content, bytes)
-        else content.encode('utf-8')
-    ).decode('ascii')
-    return DisjunctiveLicense(name=f'{lack.value} license file: {"/".join(Path(file_name).parts)}',
-                              acknowledgement=lack,
-                              text=AttachedText(content=content_s,
-                                                encoding=encoding,
-                                                content_type=content_type))
+    return DisjunctiveLicense(
+        name=f'{lack.value} license file: {"/".join(Path(file_name).parts)}',
+        acknowledgement=lack,
+        text=AttachedText(
+            content_type=content_type,
+            encoding=Encoding.BASE_64,
+            # Per PEP 639 spec, license files are human-readable texts.
+            # But in reality, we found non-printable bytes in some files!
+            content=b64encode(
+                content
+                if isinstance(content, bytes)
+                else content.encode('utf-8')
+            ).decode('ascii')))