dings

Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
CycloneDX · Jun 9, 2024 · ce4a503 · ce4a503
1 parent d3c84d2
commit ce4a503
Show file tree

Hide file tree

Showing 13 changed files with 7,536 additions and 464 deletions.
diff --git a/cyclonedx_py/_internal/environment.py b/cyclonedx_py/_internal/environment.py
@@ -107,7 +107,7 @@ def make_argument_parser(**kwargs: Any) -> 'ArgumentParser':
                        action='store_true',
                        dest='pep639',
                        help='Enable license gathering according to PEP 639 '
-                            '(improving license clarity with better package metadata)\n'
+                            '(improving license clarity with better package metadata).\n'
                             'The behaviour may change during the draft development of the PEP.')
         p.add_argument('--gather-license-texts',
                        action='store_true',

diff --git a/cyclonedx_py/_internal/utils/pep639.py b/cyclonedx_py/_internal/utils/pep639.py
@@ -65,7 +65,7 @@ def dist2licenses(
                 continue
             content_type = guess_type(mlfile)[0] or AttachedText.DEFAULT_CONTENT_TYPE
             encoding = None
-            if content_type.startswith('text/'):
+            if not content_type.startswith('text/'):
                 mlfile_c, encoding = b64encode(bytes(mlfile_c, 'utf-8')).decode('ascii'), Encoding.BASE_64
             yield DisjunctiveLicense(
                 name=f'declared license file: {mlfile}',

diff --git a/tests/_data/snapshots/environment/pep639-texts_with-extras_1.1.xml.bin b/tests/_data/snapshots/environment/pep639-texts_with-extras_1.1.xml.bin
diff --git a/tests/_data/snapshots/environment/pep639-texts_with-extras_1.2.json.bin b/tests/_data/snapshots/environment/pep639-texts_with-extras_1.2.json.bin
diff --git a/tests/_data/snapshots/environment/pep639-texts_with-extras_1.2.xml.bin b/tests/_data/snapshots/environment/pep639-texts_with-extras_1.2.xml.bin
diff --git a/tests/_data/snapshots/environment/pep639-texts_with-extras_1.3.json.bin b/tests/_data/snapshots/environment/pep639-texts_with-extras_1.3.json.bin
diff --git a/tests/_data/snapshots/environment/pep639-texts_with-extras_1.3.xml.bin b/tests/_data/snapshots/environment/pep639-texts_with-extras_1.3.xml.bin
diff --git a/tests/_data/snapshots/environment/pep639-texts_with-extras_1.4.json.bin b/tests/_data/snapshots/environment/pep639-texts_with-extras_1.4.json.bin
diff --git a/tests/_data/snapshots/environment/pep639-texts_with-extras_1.4.xml.bin b/tests/_data/snapshots/environment/pep639-texts_with-extras_1.4.xml.bin
diff --git a/tests/_data/snapshots/environment/pep639-texts_with-extras_1.5.json.bin b/tests/_data/snapshots/environment/pep639-texts_with-extras_1.5.json.bin
diff --git a/tests/_data/snapshots/environment/pep639-texts_with-extras_1.5.xml.bin b/tests/_data/snapshots/environment/pep639-texts_with-extras_1.5.xml.bin
diff --git a/tests/_data/snapshots/environment/pep639-texts_with-extras_1.6.json.bin b/tests/_data/snapshots/environment/pep639-texts_with-extras_1.6.json.bin
diff --git a/tests/_data/snapshots/environment/pep639-texts_with-extras_1.6.xml.bin b/tests/_data/snapshots/environment/pep639-texts_with-extras_1.6.xml.bin