[issue-456, refactor] replace str_or_no_assertion_or_none with parse …

…helper method Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
spdx · meretp · Feb 22, 2023 · Feb 1, 2023 · Feb 1, 2023 · Feb 9, 2023
commit 9737fde5a0ccc73ec988825fe6e57e65ed2b5f6a
diff --git a/src/spdx/parser/rdf/file_parser.py b/src/spdx/parser/rdf/file_parser.py
@@ -14,7 +14,7 @@
 from spdx.parser.logger import Logger
 from spdx.parser.parsing_functions import construct_or_raise_parsing_error, raise_parsing_error_if_logger_has_messages
 from spdx.parser.rdf.checksum_parser import parse_checksum
-from spdx.parser.rdf.graph_parsing_functions import parse_literal, parse_spdx_id, str_to_no_assertion_or_none
+from spdx.parser.rdf.graph_parsing_functions import parse_literal, parse_spdx_id, parse_literal_or_no_assertion_or_none
 from spdx.rdfschema.namespace import SPDX_NAMESPACE
 
 
@@ -23,20 +23,20 @@ def parse_file(file_node: URIRef, graph: Graph, doc_namespace: str) -> File:
     spdx_id = parse_spdx_id(file_node, doc_namespace, graph)
     name = parse_literal(logger, graph, file_node, SPDX_NAMESPACE.fileName)
     checksums = []
-    for (_,_,checksum_node) in graph.triples((file_node, SPDX_NAMESPACE.checksum, None)):
+    for (_, _, checksum_node) in graph.triples((file_node, SPDX_NAMESPACE.checksum, None)):
         checksums.append(parse_checksum(checksum_node, graph))
 
     file_types = []
-    for (_,_,file_type_ref) in graph.triples((file_node, SPDX_NAMESPACE.fileType, None)):
+    for (_, _, file_type_ref) in graph.triples((file_node, SPDX_NAMESPACE.fileType, None)):
         try:
             file_types.append(convert_uri_ref_to_file_type(file_type_ref))
         except KeyError:
             logger.append(f"Invalid FileType: {file_type_ref}")
     license_comment = parse_literal(logger, graph, file_node, SPDX_NAMESPACE.licenseComments)
-    copyright_text = parse_literal(logger, graph, file_node, SPDX_NAMESPACE.copyrightText,
-                                       method_to_apply=str_to_no_assertion_or_none)
+    copyright_text = parse_literal_or_no_assertion_or_none(logger, graph, file_node, SPDX_NAMESPACE.copyrightText,
+                                                           method_to_apply=str)
     file_contributors = []
-    for (_,_,file_contributor) in graph.triples((file_node, SPDX_NAMESPACE.fileContributor,None)):
+    for (_, _, file_contributor) in graph.triples((file_node, SPDX_NAMESPACE.fileContributor, None)):
         file_contributors.append(file_contributor.toPython())
 
     notice_text = parse_literal(logger, graph, file_node, SPDX_NAMESPACE.noticeText)

diff --git a/src/spdx/parser/rdf/graph_parsing_functions.py b/src/spdx/parser/rdf/graph_parsing_functions.py
@@ -82,14 +82,6 @@ def parse_enum_value(enum_str: str, enum_class: Type[Enum]) -> Enum:
         raise SPDXParsingError([f"Invalid value for {enum_class}: {enum_str}"])
 
 
-def str_to_no_assertion_or_none(value: str) -> Union[str, SpdxNone, SpdxNoAssertion]:
-    if value == SPDX_NO_ASSERTION_STRING:
-        return SpdxNoAssertion()
-    if value == SPDX_NONE_STRING:
-        return SpdxNone()
-    return value
-
-
 def parse_spdx_id(resource: URIRef, doc_namespace: str, graph: Graph) -> Optional[str]:
     if not resource:
         return None

diff --git a/src/spdx/parser/rdf/package_parser.py b/src/spdx/parser/rdf/package_parser.py
@@ -23,16 +23,17 @@
 from spdx.parser.logger import Logger
 from spdx.parser.parsing_functions import raise_parsing_error_if_logger_has_messages, construct_or_raise_parsing_error
 from spdx.parser.rdf.checksum_parser import parse_checksum
-from spdx.parser.rdf.graph_parsing_functions import parse_spdx_id, parse_literal, str_to_no_assertion_or_none, \
-    parse_enum_value, parse_literal_or_no_assertion_or_none
+from spdx.parser.rdf.graph_parsing_functions import parse_spdx_id, parse_literal, parse_enum_value, \
+    parse_literal_or_no_assertion_or_none
 from spdx.rdfschema.namespace import SPDX_NAMESPACE, REFERENCE_NAMESPACE
 
 
 def parse_package(package_node: URIRef, graph: Graph, doc_namespace: str) -> Package:
     logger = Logger()
     spdx_id = parse_spdx_id(package_node, doc_namespace, graph)
     name = parse_literal(logger, graph, package_node, SPDX_NAMESPACE.name)
-    download_location = parse_literal_or_no_assertion_or_none(logger, graph, package_node, SPDX_NAMESPACE.downloadLocation,
+    download_location = parse_literal_or_no_assertion_or_none(logger, graph, package_node,
+                                                              SPDX_NAMESPACE.downloadLocation,
                                                               method_to_apply=str)
     checksums = []
     for (_, _, checksum_node) in graph.triples((package_node, SPDX_NAMESPACE.checksum, None)):
@@ -63,8 +64,8 @@ def parse_package(package_node: URIRef, graph: Graph, doc_namespace: str) -> Pac
     comment = parse_literal(logger, graph, package_node, RDFS.comment)
     summary = parse_literal(logger, graph, package_node, SPDX_NAMESPACE.summary)
     description = parse_literal(logger, graph, package_node, SPDX_NAMESPACE.description)
-    copyright_text = parse_literal(logger, graph, package_node, SPDX_NAMESPACE.copyrightText,
-                                   method_to_apply=str_to_no_assertion_or_none)
+    copyright_text = parse_literal_or_no_assertion_or_none(logger, graph, package_node, SPDX_NAMESPACE.copyrightText,
+                                                           method_to_apply=str)
     source_info = parse_literal(logger, graph, package_node, SPDX_NAMESPACE.sourceInfo)
     primary_package_purpose = parse_literal(logger, graph, package_node, SPDX_NAMESPACE.primaryPackagePurpose,
                                             prefix=SPDX_NAMESPACE.purpose_,

diff --git a/src/spdx/parser/rdf/snippet_parser.py b/src/spdx/parser/rdf/snippet_parser.py
@@ -16,7 +16,7 @@
 from spdx.model.snippet import Snippet
 from spdx.parser.logger import Logger
 from spdx.parser.parsing_functions import construct_or_raise_parsing_error, raise_parsing_error_if_logger_has_messages
-from spdx.parser.rdf.graph_parsing_functions import parse_literal, str_to_no_assertion_or_none, parse_spdx_id
+from spdx.parser.rdf.graph_parsing_functions import parse_literal, parse_spdx_id, parse_literal_or_no_assertion_or_none
 from spdx.rdfschema.namespace import SPDX_NAMESPACE, POINTER_NAMESPACE
 
 
@@ -29,8 +29,8 @@ def parse_snippet(snippet_node: URIRef, graph: Graph, doc_namespace: str) -> Sni
     line_range = parse_ranges(snippet_node, graph, POINTER_NAMESPACE.LineCharPointer, POINTER_NAMESPACE.lineNumber)
 
     license_comment = parse_literal(logger, graph, snippet_node, SPDX_NAMESPACE.licenseComments)
-    copyright_text = parse_literal(logger, graph, snippet_node, SPDX_NAMESPACE.copyrightText,
-                                   method_to_apply=str_to_no_assertion_or_none)
+    copyright_text = parse_literal_or_no_assertion_or_none(logger, graph, snippet_node, SPDX_NAMESPACE.copyrightText,
+                                                           method_to_apply=str)
     comment = parse_literal(logger, graph, snippet_node, RDFS.comment)
     name = parse_literal(logger, graph, snippet_node, SPDX_NAMESPACE.name)
     attribution_texts = []
@@ -65,5 +65,3 @@ def parse_range_value(graph: Graph, pointer_node: Node, predicate: Node) -> Opti
     if value:
         value = int(value)
     return value
-
-
diff --git a/tests/spdx/parser/rdf/test_graph_parsing_function.py b/tests/spdx/parser/rdf/test_graph_parsing_function.py
@@ -11,17 +11,7 @@
 import pytest
 from rdflib import URIRef, Graph, Namespace
 
-from spdx.model.spdx_no_assertion import SpdxNoAssertion
-from spdx.model.spdx_none import SpdxNone
-from spdx.parser.rdf.graph_parsing_functions import str_to_no_assertion_or_none, parse_spdx_id
-
-
-@pytest.mark.parametrize("value,expected", [("NOASSERTION", SpdxNoAssertion()), ("NONE", SpdxNone()), ("test", "test"),
-                                            ("Noassertion", "Noassertion")])
-def test_str_to_no_assertion_or_none(value, expected):
-    result = str_to_no_assertion_or_none(value)
-
-    assert result == expected
+from spdx.parser.rdf.graph_parsing_functions import parse_spdx_id
 
 
 @pytest.mark.parametrize("resource,doc_namespace,ext_namespace_mapping,expected",