From 4456975159ef1788a9d4d18b01dd75a2e8eef9eb Mon Sep 17 00:00:00 2001 From: Ayan Sinha Mahapatra Date: Tue, 11 Jul 2023 21:18:25 +0530 Subject: [PATCH] Refactor and address feedback Signed-off-by: Ayan Sinha Mahapatra --- src/packagedcode/jar_manifest.py | 6 ++++++ src/packagedcode/maven.py | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/packagedcode/jar_manifest.py b/src/packagedcode/jar_manifest.py index b94061ab54b..1bc09e16016 100644 --- a/src/packagedcode/jar_manifest.py +++ b/src/packagedcode/jar_manifest.py @@ -378,6 +378,11 @@ def parse_scm_connection(scm_connection): def get_datasource_id(package_type): + """ + Get the corresponding `datasource_id` for the given + `package_type`. This is a seperate function to avoid + cyclic imports. + """ from packagedcode.maven import JavaJarManifestHandler from packagedcode.maven import JavaOSGiManifestHandler @@ -388,6 +393,7 @@ def get_datasource_id(package_type): elif package_type == 'osgi': return JavaOSGiManifestHandler.datasource_id + def is_id(s): """ Return True if `s` is some kind of id. diff --git a/src/packagedcode/maven.py b/src/packagedcode/maven.py index 01dcc47a028..c06d1dfe349 100644 --- a/src/packagedcode/maven.py +++ b/src/packagedcode/maven.py @@ -1308,11 +1308,11 @@ def get_license_detections_for_extracted_license_statement( for license_entry in new_extracted_license: license_entry.pop("distribution") - if not license_entry.get("name", None): + if not license_entry.get("name"): license_entry.pop("name") - if not license_entry.get("url", None): + if not license_entry.get("url"): license_entry.pop("url") - if not license_entry.get("comments", None): + if not license_entry.get("comments"): license_entry.pop("comments") extracted_license_statement = saneyaml.dump(new_extracted_license)