diff --git a/src/parser/json/actor_parser.py b/src/parser/json/actor_parser.py index cfd835d5b..31082e0fc 100644 --- a/src/parser/json/actor_parser.py +++ b/src/parser/json/actor_parser.py @@ -9,10 +9,9 @@ # See the License for the specific language governing permissions and # limitations under the License. import re -from typing import Union, Pattern, Match, Optional +from typing import Pattern, Match, Optional from src.model.actor import Actor, ActorType -from src.model.spdx_no_assertion import SpdxNoAssertion from src.parser.error import SPDXParsingError from src.parser.json.dict_parsing_functions import construct_or_raise_parsing_error diff --git a/src/parser/json/annotation_parser.py b/src/parser/json/annotation_parser.py index 0dbf4e7fc..44bbe6242 100644 --- a/src/parser/json/annotation_parser.py +++ b/src/parser/json/annotation_parser.py @@ -16,8 +16,7 @@ from src.parser.error import SPDXParsingError from src.parser.json.actor_parser import ActorParser from src.parser.json.dict_parsing_functions import datetime_from_str, construct_or_raise_parsing_error, \ - parse_field_or_log_error, append_parsed_field_or_log_error, raise_parsing_error_if_logger_has_messages, \ - parse_list_of_elements + parse_field_or_log_error, append_parsed_field_or_log_error, raise_parsing_error_if_logger_has_messages from src.parser.logger import Logger diff --git a/src/parser/json/checksum_parser.py b/src/parser/json/checksum_parser.py index c86cb3e7d..d6f82c412 100644 --- a/src/parser/json/checksum_parser.py +++ b/src/parser/json/checksum_parser.py @@ -8,12 +8,11 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from typing import Dict, List, Optional +from typing import Dict, Optional from src.model.checksum import Checksum, ChecksumAlgorithm -from src.parser.error import SPDXParsingError -from src.parser.json.dict_parsing_functions import append_parsed_field_or_log_error, \ - raise_parsing_error_if_logger_has_messages, json_str_to_enum_name, construct_or_raise_parsing_error +from src.parser.json.dict_parsing_functions import raise_parsing_error_if_logger_has_messages, json_str_to_enum_name, \ + construct_or_raise_parsing_error from src.parser.logger import Logger diff --git a/src/parser/json/dict_parsing_functions.py b/src/parser/json/dict_parsing_functions.py index 55262b61d..e7b0dd707 100644 --- a/src/parser/json/dict_parsing_functions.py +++ b/src/parser/json/dict_parsing_functions.py @@ -9,7 +9,7 @@ # See the License for the specific language governing permissions and # limitations under the License. from datetime import datetime -from typing import Any, Callable, Dict, List, Union, Optional +from typing import Any, Callable, Dict, List, Optional from src.model.spdx_no_assertion import SpdxNoAssertion from src.model.spdx_none import SpdxNone diff --git a/src/parser/json/file_parser.py b/src/parser/json/file_parser.py index e9c236aee..8b92b0290 100644 --- a/src/parser/json/file_parser.py +++ b/src/parser/json/file_parser.py @@ -18,7 +18,7 @@ from src.parser.json.checksum_parser import ChecksumParser from src.parser.json.dict_parsing_functions import raise_parsing_error_if_logger_has_messages, \ construct_or_raise_parsing_error, parse_field_or_log_error, \ - parse_field_or_no_assertion_or_none, parse_list_of_elements + parse_field_or_no_assertion_or_none from src.parser.json.license_expression_parser import LicenseExpressionParser from src.parser.logger import Logger diff --git a/src/parser/json/package_parser.py b/src/parser/json/package_parser.py index eb7118dc8..5c2c53494 100644 --- a/src/parser/json/package_parser.py +++ b/src/parser/json/package_parser.py @@ -22,7 +22,7 @@ from src.parser.json.checksum_parser import ChecksumParser from src.parser.json.dict_parsing_functions import append_parsed_field_or_log_error, datetime_from_str, \ raise_parsing_error_if_logger_has_messages, json_str_to_enum_name, construct_or_raise_parsing_error, \ - parse_field_or_log_error, parse_field_or_no_assertion_or_none, parse_field_or_no_assertion, parse_list_of_elements + parse_field_or_log_error, parse_field_or_no_assertion_or_none, parse_field_or_no_assertion from src.parser.json.license_expression_parser import LicenseExpressionParser from src.parser.logger import Logger diff --git a/src/validation/relationship_validator.py b/src/validation/relationship_validator.py index edf875469..87da7f9ba 100644 --- a/src/validation/relationship_validator.py +++ b/src/validation/relationship_validator.py @@ -9,7 +9,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from typing import List, Union +from typing import List from src.model.document import Document from src.model.relationship import Relationship, RelationshipType diff --git a/tests/parser/test_extracted_licensing_info_parser.py b/tests/parser/test_extracted_licensing_info_parser.py index 47f70ef6b..8b529aace 100644 --- a/tests/parser/test_extracted_licensing_info_parser.py +++ b/tests/parser/test_extracted_licensing_info_parser.py @@ -12,7 +12,6 @@ import pytest -from src.model.spdx_no_assertion import SpdxNoAssertion from src.parser.error import SPDXParsingError from src.parser.json.extracted_licensing_info_parser import ExtractedLicensingInfoParser diff --git a/tests/parser/test_json_parser.py b/tests/parser/test_json_parser.py index 3b6ef3133..65a24cc47 100644 --- a/tests/parser/test_json_parser.py +++ b/tests/parser/test_json_parser.py @@ -13,7 +13,6 @@ import pytest from src.model.document import Document -from src.parser.error import SPDXParsingError from src.parser.json.json_parser import JsonParser def test_parse_json_file_not_found(): diff --git a/tests/validation/test_external_document_ref_validator.py b/tests/validation/test_external_document_ref_validator.py index 1c2e5cf52..84ead91ad 100644 --- a/tests/validation/test_external_document_ref_validator.py +++ b/tests/validation/test_external_document_ref_validator.py @@ -11,12 +11,10 @@ from typing import List -import pytest - from src.model.external_document_ref import ExternalDocumentRef from src.validation.external_document_ref_validator import validate_external_document_ref -from src.validation.validation_message import ValidationMessage, ValidationContext, SpdxElementType -from tests.valid_defaults import get_checksum, get_external_document_ref +from src.validation.validation_message import ValidationMessage +from tests.valid_defaults import get_checksum def test_valid_external_document_ref():