fix(EnvironmentParser): remove code break when classifier parsing in py>=3.8 (#431)

Signed-off-by: a1lu <github.foreshoe@slmail.me>

Author: a1lu

cyclonedx_py/parser/environment.py

@@ -75,18 +75,17 @@ def __init__(self, use_purl_bom_ref: bool = False) -> None:
                 # Therefore, just go with a named license.
                 c.licenses.add(LicenseChoice(license_=License(license_name=i_metadata['License'])))
 
-            if 'Classifier' in i_metadata:
-                for classifier in i_metadata['Classifier']:
-                    # Trove classifiers - https://packaging.python.org/specifications/core-metadata/#metadata-classifier
-                    # Full list: https://pypi.python.org/pypi?%3Aaction=list_classifiers
-                    if str(classifier).startswith('License :: OSI Approved :: '):
-                        c.licenses.add(LicenseChoice(license_=License(
-                            license_name=str(classifier).replace('License :: OSI Approved :: ', '').strip()
-                        )))
-                    elif str(classifier).startswith('License :: '):
-                        c.licenses.add(LicenseChoice(license_=License(
-                            license_name=str(classifier).replace('License :: ', '').strip()
-                        )))
+            for classifier in i_metadata.get_all("Classifier"):
+                # Trove classifiers - https://packaging.python.org/specifications/core-metadata/#metadata-classifier
+                # Full list: https://pypi.python.org/pypi?%3Aaction=list_classifiers
+                if str(classifier).startswith('License :: OSI Approved :: '):
+                    c.licenses.add(LicenseChoice(license_=License(
+                        license_name=str(classifier).replace('License :: OSI Approved :: ', '').strip()
+                    )))
+                elif str(classifier).startswith('License :: '):
+                    c.licenses.add(LicenseChoice(license_=License(
+                        license_name=str(classifier).replace('License :: ', '').strip()
+                    )))
 
             self._components.append(c)
 

tests/test_parser_environment.py

@@ -19,6 +19,8 @@
 
 from unittest import TestCase
 
+from cyclonedx.model import License, LicenseChoice
+
 from cyclonedx_py.parser.environment import EnvironmentParser
 
 
@@ -39,7 +41,9 @@ def test_simple(self) -> None:
         self.assertIsNotNone(c_tox)
         self.assertNotEqual(c_tox.purl.to_string(), c_tox.bom_ref.value)
         self.assertIsNotNone(c_tox.licenses)
-        self.assertEqual('MIT', c_tox.licenses.pop().license.name)
+        self.assertEqual(len(c_tox.licenses), 2)
+        self.assertEqual({LicenseChoice(license_=License(license_name="MIT License")),
+                          LicenseChoice(license_=License(license_name="MIT"))}, c_tox.licenses)
 
     def test_simple_use_purl_bom_ref(self) -> None:
         """
@@ -56,4 +60,6 @@ def test_simple_use_purl_bom_ref(self) -> None:
         self.assertIsNotNone(c_tox)
         self.assertEqual(c_tox.purl.to_string(), c_tox.bom_ref.value)
         self.assertIsNotNone(c_tox.licenses)
-        self.assertEqual('MIT', c_tox.licenses.pop().license.name)
+        self.assertEqual(len(c_tox.licenses), 2)
+        self.assertEqual({LicenseChoice(license_=License(license_name="MIT License")),
+                          LicenseChoice(license_=License(license_name="MIT"))}, c_tox.licenses)