Skip to content

[issue-344] rename seeAlso to seeAlsos in json/yaml/xml #346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 5, 2022
Merged

[issue-344] rename seeAlso to seeAlsos in json/yaml/xml #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion spdx/parsers/jsonyamlxml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ def parse_extracted_license_info(self, extracted_license_info):
self.parse_ext_lic_name(extracted_license.get("name"))
self.parse_ext_lic_comment(extracted_license.get("comment"))
self.parse_ext_lic_text(extracted_license.get("extractedText"))
self.parse_ext_lic_cross_refs(extracted_license.get("seeAlso"))
self.parse_ext_lic_cross_refs(extracted_license.get("seeAlsos"))
else:
self.value_error("EXTR_LIC", extracted_license)

Expand Down
2 changes: 1 addition & 1 deletion spdx/parsers/xmlparser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def __init__(self, builder, logger):
"creators",
"externalDocumentRefs",
"extractedLicenseInfos",
"seeAlso",
"seeAlsos",
"annotations",
"relationships",
"snippets",
Expand Down
4 changes: 2 additions & 2 deletions spdx/writers/jsonyamlxml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,10 +465,10 @@ def create_extracted_license(self):
if extracted_license.cross_ref:
if isinstance(extracted_license.cross_ref, Literal):
extracted_license_object[
"seeAlso"
"seeAlsos"
] = extracted_license.cross_ref.toPython()
else:
extracted_license_object["seeAlso"] = extracted_license.cross_ref
extracted_license_object["seeAlsos"] = extracted_license.cross_ref

if extracted_license.comment:
if isinstance(extracted_license.comment, Literal):
Expand Down
2 changes: 1 addition & 1 deletion tests/data/formats/SPDXJsonExample.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
"comment": "This is tye CyperNeko License",
"licenseId": "LicenseRef-3",
"name": "CyberNeko License",
"seeAlso": [
"seeAlsos": [
"http://justasample.url.com",
"http://people.apache.org/~andyc/neko/LICENSE"
]
Expand Down
4 changes: 2 additions & 2 deletions tests/data/formats/SPDXXmlExample.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</extractedText>
<comment>This is tye CyperNeko License</comment>
<licenseId>LicenseRef-3</licenseId>
<name>CyberNeko License</name>
<seeAlso>http://justasample.url.com</seeAlso>
<seeAlso>http://people.apache.org/~andyc/neko/LICENSE</seeAlso>
<seeAlsos>http://justasample.url.com</seeAlsos>
<seeAlsos>http://people.apache.org/~andyc/neko/LICENSE</seeAlsos>
</hasExtractedLicensingInfos>
<hasExtractedLicensingInfos>
<extractedText>/*
Expand Down
2 changes: 1 addition & 1 deletion tests/data/formats/SPDXYamlExample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ Document:
\ USE OF THIS SOFTWARE,\nEVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
licenseId: LicenseRef-3
name: CyberNeko License
seeAlso:
seeAlsos:
- http://justasample.url.com
- http://people.apache.org/~andyc/neko/LICENSE
- extractedText: "/*\n * (c) Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006,\
Expand Down