Refactor and simplify

Signed-off-by: Michael Schlenker <[email protected]>

Author: Michael Schlenker

cyclonedx_py/_internal/utils/pep639.py

@@ -39,36 +39,36 @@
     from cyclonedx.model.license import License
 
 
+def _try_load(dist: 'Distribution', metadir: str, filename: str) -> Union[str, None]:
+    # Might raise NotImplementedError in theory
+    # but nothing we can do in that case.
+    try:
+        candidate = dist.locate_file(join(metadir, filename))
+    except NotImplementedError:
+        return None
+
+    if not candidate:
+        return None
+
+    try:
+        with open(str(candidate), 'rb') as fin:
+            return io2str(fin)
+    except FileNotFoundError:
+        pass
+    return None
+
+
 def handle_bad_license_file_encoding(
     dist: 'Distribution',
     lfile: str,
     logger: 'Logger'
 ) -> Union[str, None]:
-
-    def try_load(dist: 'Distribution', metadir: str, filename: str) -> Union[str, None]:
-        # Might raise NotImplementedError in theory
-        # but nothing we can do in that case.
-        try:
-            candidate = dist.locate_file(join(metadir, filename))
-        except NotImplementedError:
-            return None
-
-        if not candidate:
-            return None
-
-        try:
-            with open(str(candidate), 'rb') as fin:
-                return io2str(fin)
-        except FileNotFoundError:
-            pass
-        return None
-
     # Distribution has no method to find the actual metadata dir,
     # e.g. dist-info or egg-info.
     # So we mimic the logic in PathDistribution and check both subdirs
     content: Union[str, None] = None
     for metadir in ('.dist-info', '.egg-info'):
-        content = try_load(dist, metadir, lfile)
+        content = _try_load(dist, metadir, lfile)
         if content:
             break
 
@@ -91,12 +91,11 @@ def gather_license_texts(
         # per spec > license files are stored in the `.dist-info/licenses/` subdirectory of the produced wheel.
         # but in practice, other locations are used, too.
         # loop over the candidate location and pick the first one found.
-        locations = ('licenses', 'license_files', '.')
         malformed = None
         content = None
-        for loc in locations:
+        for loc in ('licenses', 'license_files', '.'):
+            path = join(loc, mlfile)
             try:
-                path = join(loc, mlfile)
                 content = dist.read_text(path)
             except UnicodeDecodeError:
                 # Malformed, stop looking
@@ -106,11 +105,11 @@ def gather_license_texts(
             if content is not None:
                 break
 
-        if content is None and malformed:  # pragma: no cover
+        if content is None and malformed:
             # Try a little harder
             content = handle_bad_license_file_encoding(dist, malformed, logger)
 
-        if content is None:  # pragme: no cover
+        if content is None:
             logger.debug('Error: failed to read license file %r for dist %r',
                          mlfile, dist.metadata['Name'])
             continue
@@ -143,6 +142,5 @@ def dist2licenses(
         # see spec: https://peps.python.org/pep-0639/#add-license-expression-field
         yield lfac.make_from_string(lexp,
                                     license_acknowledgement=lack)
-    if gather_text and (lfiles := set(str(fn) for fn in metadata.get_all('License-File', ()))):
-        for lic in gather_license_texts(dist, lfiles, logger):
-            yield lic
+    if gather_text and (lfiles := set(fn for fn in metadata.get_all('License-File', ()))):
+        yield from gather_license_texts(dist, lfiles, logger)