[review] use double quotes

Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>

Author: Meret Behrens

tests/spdx/parser/tagvalue/test_annotation_parser.py

@@ -20,40 +20,40 @@
 
 def test_parse_annotation():
     parser = Parser()
-    annotation_str = '\n'.join([
-        'Annotator: Person: Jane Doe()',
-        'AnnotationDate: 2010-01-29T18:30:22Z',
-        'AnnotationComment: <text>Document level annotation</text>',
-        'AnnotationType: OTHER',
-        'SPDXREF: SPDXRef-DOCUMENT'
+    annotation_str = "\n".join([
+        "Annotator: Person: Jane Doe()",
+        "AnnotationDate: 2010-01-29T18:30:22Z",
+        "AnnotationComment: <text>Document level annotation</text>",
+        "AnnotationType: OTHER",
+        "SPDXREF: SPDXRef-DOCUMENT"
     ])
     document = parser.parse("\n".join([DOCUMENT_STR, annotation_str]))
     assert document is not None
     assert len(document.annotations) == 1
     annotation = document.annotations[0]
-    assert annotation.annotator.name == 'Jane Doe'
+    assert annotation.annotator.name == "Jane Doe"
     assert annotation.annotation_date == datetime(2010, 1, 29, 18, 30, 22)
-    assert annotation.annotation_comment == 'Document level annotation'
+    assert annotation.annotation_comment == "Document level annotation"
     assert annotation.annotation_type == AnnotationType.OTHER
-    assert annotation.spdx_id == 'SPDXRef-DOCUMENT'
+    assert annotation.spdx_id == "SPDXRef-DOCUMENT"
 
 
 @pytest.mark.parametrize("annotation_str, expected_message", [
-    ('Annotator: Person: Jane Doe()', r"__init__() missing 4 "
+    ("Annotator: Person: Jane Doe()", r"__init__() missing 4 "
                                       "required positional arguments: 'spdx_id', 'annotation_type', "
                                       "'annotation_date', and 'annotation_comment'"),
-    ('Annotator: Person: Jane Doe()\nAnnotationType: SOURCE\nAnnotationDate: 201001-2912:23',
+    ("Annotator: Person: Jane Doe()\nAnnotationType: SOURCE\nAnnotationDate: 201001-2912:23",
      "Error while parsing Annotation: ['Invalid AnnotationType: SOURCE. Line: 2', "
      "'Error while parsing AnnotationDate: Token did not match specified grammar "
      "rule. Line: 3']"),
-    ('Annotator: Jane Doe()\nAnnotationDate: 201001-29T18:30:22Z\n'
-     'AnnotationComment: <text>Document level annotation</text>\nAnnotationType: OTHER\nSPDXREF: SPDXRef-DOCUMENT',
+    ("Annotator: Jane Doe()\nAnnotationDate: 201001-29T18:30:22Z\n"
+     "AnnotationComment: <text>Document level annotation</text>\nAnnotationType: OTHER\nSPDXREF: SPDXRef-DOCUMENT",
      "Error while parsing Annotation: ['Error while parsing Annotator: Token did "
      "not match specified grammar rule. Line: 1', 'Error while parsing "
      "AnnotationDate: Token did not match specified grammar rule. Line: 2']"),
-    ('Annotator: Person: ()', "Error while parsing Annotation: [['No name for Person provided: Person: ().']]"),
-    ('AnnotationType: REVIEW', 'Element Annotation is not the current element in scope, probably the '
-                               'expected tag to start the element (Annotator) is missing. Line: 1')])
+    ("Annotator: Person: ()", "Error while parsing Annotation: [['No name for Person provided: Person: ().']]"),
+    ("AnnotationType: REVIEW", "Element Annotation is not the current element in scope, probably the "
+                               "expected tag to start the element (Annotator) is missing. Line: 1")])
 def test_parse_invalid_annotation(annotation_str, expected_message):
     parser = Parser()
     with pytest.raises(SPDXParsingError) as err:

tests/spdx/parser/tagvalue/test_creation_info_parser.py

@@ -20,19 +20,19 @@
 from spdx.parser.error import SPDXParsingError
 from spdx.parser.tagvalue.parser import Parser
 
-DOCUMENT_STR = '\n'.join([
-    'SPDXVersion: SPDX-2.3',
-    'DataLicense: CC0-1.0',
-    'DocumentName: Sample_Document-V2.3',
-    'SPDXID: SPDXRef-DOCUMENT',
-    'DocumentComment: <text>Sample Comment</text>',
-    'DocumentNamespace: https://spdx.org/spdxdocs/spdx-example-444504E0-4F89-41D3-9A0C-0305E82C3301',
-    'ExternalDocumentRef: DocumentRef-spdx-tool-1.2 http://spdx.org/spdxdocs/spdx-tools-v1.2-3F2504E0-4F89-41D3-9A0C-0305E82C3301 SHA1: d6a770ba38583ed4bb4525bd96e50461655d2759',
-    'Creator: Person: Bob (bob@example.com)',
-    'Creator: Organization: Acme.',
-    'Created: 2010-02-03T00:00:00Z',
-    'CreatorComment: <text>Sample Comment \nwith multiple \nlines.</text>',
-    'LicenseListVersion: 3.17'
+DOCUMENT_STR = "\n".join([
+    "SPDXVersion: SPDX-2.3",
+    "DataLicense: CC0-1.0",
+    "DocumentName: Sample_Document-V2.3",
+    "SPDXID: SPDXRef-DOCUMENT",
+    "DocumentComment: <text>Sample Comment</text>",
+    "DocumentNamespace: https://spdx.org/spdxdocs/spdx-example-444504E0-4F89-41D3-9A0C-0305E82C3301",
+    "ExternalDocumentRef: DocumentRef-spdx-tool-1.2 http://spdx.org/spdxdocs/spdx-tools-v1.2-3F2504E0-4F89-41D3-9A0C-0305E82C3301 SHA1: d6a770ba38583ed4bb4525bd96e50461655d2759",
+    "Creator: Person: Bob (bob@example.com)",
+    "Creator: Organization: Acme.",
+    "Created: 2010-02-03T00:00:00Z",
+    "CreatorComment: <text>Sample Comment \nwith multiple \nlines.</text>",
+    "LicenseListVersion: 3.17"
 ])
 
 
@@ -43,15 +43,15 @@ def test_parse_creation_info():
     creation_info = document.creation_info
     assert creation_info is not None
     assert creation_info.spdx_version == "SPDX-2.3"
-    assert creation_info.data_license == 'CC0-1.0'
-    assert creation_info.name == 'Sample_Document-V2.3'
-    assert creation_info.spdx_id == 'SPDXRef-DOCUMENT'
-    assert creation_info.document_comment == 'Sample Comment'
-    assert creation_info.document_namespace == 'https://spdx.org/spdxdocs/spdx-example-444504E0-4F89-41D3-9A0C-0305E82C3301'
+    assert creation_info.data_license == "CC0-1.0"
+    assert creation_info.name == "Sample_Document-V2.3"
+    assert creation_info.spdx_id == "SPDXRef-DOCUMENT"
+    assert creation_info.document_comment == "Sample Comment"
+    assert creation_info.document_namespace == "https://spdx.org/spdxdocs/spdx-example-444504E0-4F89-41D3-9A0C-0305E82C3301"
     TestCase().assertCountEqual(creation_info.creators,
                                 [Actor(ActorType.PERSON, "Bob", "bob@example.com"),
                                  Actor(ActorType.ORGANIZATION, "Acme.")])
-    assert creation_info.creator_comment == 'Sample Comment \nwith multiple \nlines.'
+    assert creation_info.creator_comment == "Sample Comment \nwith multiple \nlines."
     assert creation_info.created == datetime(2010, 2, 3)
     assert creation_info.license_list_version == Version(3, 17)
     assert creation_info.external_document_refs == [ExternalDocumentRef("DocumentRef-spdx-tool-1.2",
@@ -61,28 +61,28 @@ def test_parse_creation_info():
 
 
 @pytest.mark.parametrize("document_str, expected_message",
-                         ([('\n'.join(
-                             ['SPDXVersion: SPDX-2.3', 'DataLicense: CC0-1.0', 'DocumentName: Sample_Document-V2.3',
-                              'SPDXID: SPDXRef-DOCUMENT', 'DocumentComment: <text>Sample Comment</text>',
-                              'DocumentNamespace: <text>Sample Comment</text>',
-                              'ExternalDocumentRef: DocumentRef-spdx-tool-1.2:htp://spdx.org:SHA1: d6a770ba38583ed4bb4525bd96e50461655d2759',
-                              'Creator: Person Bob (bob@example.com)', 'Creator: Organization: Acme [email]',
-                              'Created: 2010-02-03T00:00:0Z', 'CreatorComment: <text>Sample Comment</text>',
-                              'LicenseListVersion: 7']),
-                            "Error while parsing CreationInfo: "
-                            "['Error while parsing DocumentNamespace: Token did not match specified grammar rule. "
-                            "Line: 6', 'Error while parsing ExternalDocumentRef: "
-                            "Token did not match specified grammar rule. Line: 7', 'Error while parsing Creator: "
-                            "Token did not match specified grammar rule. Line: 8', 'Error while parsing Created: "
-                            "Token did not match specified grammar rule. Line: 10', '7 is not a valid version string']"),
-                             ('\n'.join(
-                                 ['SPDXVersion: SPDX-2.3', 'DataLicense: CC0-1.0', 'DocumentName: Sample_Document-V2.3',
-                                  'SPDXID: SPDXRef-DOCUMENT']),
-                              r"__init__() missing 3 required positional arguments: "
-                              r"'document_namespace', 'creators', and 'created'"),
-                             ('LicenseListVersion: 3.5\nLicenseListVersion: 3.7',
-                              "Error while parsing CreationInfo: ['Multiple values for LicenseListVersion "
-                              "found. Line: 2']")]))
+                         ([("\n".join(
+                             ["SPDXVersion: SPDX-2.3", "DataLicense: CC0-1.0", "DocumentName: Sample_Document-V2.3",
+                              "SPDXID: SPDXRef-DOCUMENT", "DocumentComment: <text>Sample Comment</text>",
+                              "DocumentNamespace: <text>Sample Comment</text>",
+                              "ExternalDocumentRef: DocumentRef-spdx-tool-1.2:htp://spdx.org:SHA1: d6a770ba38583ed4bb4525bd96e50461655d2759",
+                              "Creator: Person Bob (bob@example.com)", "Creator: Organization: Acme [email]",
+                              "Created: 2010-02-03T00:00:0Z", "CreatorComment: <text>Sample Comment</text>",
+                              "LicenseListVersion: 7"]),
+                            "Error while parsing CreationInfo: ['Error while parsing DocumentNamespace: "
+                            "Token did not match specified grammar rule. Line: 6', 'Error while parsing "
+                            "ExternalDocumentRef: Token did not match specified grammar rule. Line: 7', "
+                            "'Error while parsing Creator: Token did not match specified grammar rule. Line: 8', "
+                            "'Error while parsing Created: Token did not match specified grammar rule. Line: 10', "
+                            "'7 is not a valid version string']"),
+                           ("\n".join(
+                               ["SPDXVersion: SPDX-2.3", "DataLicense: CC0-1.0", "DocumentName: Sample_Document-V2.3",
+                                "SPDXID: SPDXRef-DOCUMENT"]),
+                            r"__init__() missing 3 required positional arguments: 'document_namespace', "
+                            r"'creators', and 'created'"),
+                           ("LicenseListVersion: 3.5\nLicenseListVersion: 3.7",
+                            "Error while parsing CreationInfo: ['Multiple values for LicenseListVersion found. "
+                            "Line: 2']")]))
 def test_parse_invalid_creation_info(document_str, expected_message):
     parser = Parser()
     with pytest.raises(SPDXParsingError) as err:

tests/spdx/parser/tagvalue/test_extracted_licensing_info_parser.py

@@ -19,24 +19,24 @@
 
 def test_parse_extracted_licensing_info():
     parser = Parser()
-    extracted_licensing_info_str = '\n'.join([
-        'LicenseID: LicenseRef-Beerware-4.2',
-        'ExtractedText: <text>"THE BEER-WARE LICENSE" (Revision 42): phk@FreeBSD.ORG wrote this file. As long as you '
-        'retain this notice you can do whatever you want with this stuff. If we meet some day, and you think this '
-        'stuff is worth it, you can buy me a beer in return Poul-Henning Kamp</text>'
-        'LicenseName: Beer-Ware License (Version 42)',
-        'LicenseCrossReference:  http://people.freebsd.org/~phk/',
-        'LicenseCrossReference:  http://another.cross.reference/',
-        'LicenseComment: The beerware license has a couple of other standard variants.'
+    extracted_licensing_info_str = "\n".join([
+        "LicenseID: LicenseRef-Beerware-4.2",
+        "ExtractedText: <text>\"THE BEER-WARE LICENSE\" (Revision 42): phk@FreeBSD.ORG wrote this file. As long as you "
+        "retain this notice you can do whatever you want with this stuff. If we meet some day, and you think this "
+        "stuff is worth it, you can buy me a beer in return Poul-Henning Kamp</text>"
+        "LicenseName: Beer-Ware License (Version 42)",
+        "LicenseCrossReference:  http://people.freebsd.org/~phk/",
+        "LicenseCrossReference:  http://another.cross.reference/",
+        "LicenseComment: The beerware license has a couple of other standard variants."
     ])
     document = parser.parse("\n".join([DOCUMENT_STR, extracted_licensing_info_str]))
     assert document is not None
     assert len(document.extracted_licensing_info) == 1
     extracted_licensing_info = document.extracted_licensing_info[0]
     assert extracted_licensing_info.license_id == "LicenseRef-Beerware-4.2"
-    assert extracted_licensing_info.extracted_text == '"THE BEER-WARE LICENSE" (Revision 42): phk@FreeBSD.ORG wrote this file. ' \
-                                                      'As long as you retain this notice you can do whatever you want with this stuff. ' \
-                                                      'If we meet some day, and you think this stuff is worth it, you can buy me a beer in return Poul-Henning Kamp'
+    assert extracted_licensing_info.extracted_text == "\"THE BEER-WARE LICENSE\" (Revision 42): phk@FreeBSD.ORG wrote this file. " \
+                                                      "As long as you retain this notice you can do whatever you want with this stuff. " \
+                                                      "If we meet some day, and you think this stuff is worth it, you can buy me a beer in return Poul-Henning Kamp"
     assert extracted_licensing_info.license_name == "Beer-Ware License (Version 42)"
     TestCase().assertCountEqual(extracted_licensing_info.cross_references,
                                 ["http://people.freebsd.org/~phk/", "http://another.cross.reference/"])
@@ -45,20 +45,22 @@ def test_parse_extracted_licensing_info():
 
 def test_parse_invalid_extracted_licensing_info():
     parser = Parser()
-    extracted_licensing_info_str = '\n'.join([
-        'ExtractedText: <text>"THE BEER-WARE LICENSE" (Revision 42): phk@FreeBSD.ORG wrote this file. As long as you retain this notice you can do whatever you want with this stuff. If we meet some day, and you think this stuff is worth it, you can buy me a beer in return Poul-Henning Kamp</text>'
-        'LicenseName: Beer-Ware License (Version 42)',
-        'LicenseCrossReference:  http://people.freebsd.org/~phk/',
-        'LicenseComment: The beerware license has a couple of other standard variants.'])
+    extracted_licensing_info_str = "\n".join([
+        "ExtractedText: <text>\"THE BEER-WARE LICENSE\" (Revision 42): phk@FreeBSD.ORG wrote this file. "
+        "As long as you retain this notice you can do whatever you want with this stuff. If we meet some day, and you "
+        "think this stuff is worth it, you can buy me a beer in return Poul-Henning Kamp</text>"
+        "LicenseName: Beer-Ware License (Version 42)",
+        "LicenseCrossReference:  http://people.freebsd.org/~phk/",
+        "LicenseComment: The beerware license has a couple of other standard variants."])
 
     with pytest.raises(SPDXParsingError) as err:
         parser.parse(extracted_licensing_info_str)
 
-    assert err.value.get_messages() == ['Element ExtractedLicensingInfo is not the current element in scope, probably '
-                                        'the expected tag to start the element (LicenseID) is missing. Line: 1',
-                                        'Element ExtractedLicensingInfo is not the current element in scope, probably '
-                                        'the expected tag to start the element (LicenseID) is missing. Line: 2',
-                                        'Element ExtractedLicensingInfo is not the current element in scope, probably '
-                                        'the expected tag to start the element (LicenseID) is missing. Line: 3',
-                                        'Element ExtractedLicensingInfo is not the current element in scope, probably '
-                                        'the expected tag to start the element (LicenseID) is missing. Line: 4']
+    assert err.value.get_messages() == ["Element ExtractedLicensingInfo is not the current element in scope, probably "
+                                        "the expected tag to start the element (LicenseID) is missing. Line: 1",
+                                        "Element ExtractedLicensingInfo is not the current element in scope, probably "
+                                        "the expected tag to start the element (LicenseID) is missing. Line: 2",
+                                        "Element ExtractedLicensingInfo is not the current element in scope, probably "
+                                        "the expected tag to start the element (LicenseID) is missing. Line: 3",
+                                        "Element ExtractedLicensingInfo is not the current element in scope, probably "
+                                        "the expected tag to start the element (LicenseID) is missing. Line: 4"]

tests/spdx/parser/tagvalue/test_file_parser.py

@@ -19,45 +19,45 @@
 
 def test_parse_file():
     parser = Parser()
-    file_str = '\n'.join([
-        'FileName: testfile.java',
-        'SPDXID: SPDXRef-File',
-        'FileType: SOURCE',
-        'FileType: TEXT',
-        'FileChecksum: SHA1: 2fd4e1c67a2d28fced849ee1bb76e7391b93eb12',
-        'LicenseConcluded: Apache-2.0',
-        'LicenseInfoInFile: Apache-2.0',
-        'FileCopyrightText: <text>Copyright 2014 Acme Inc.</text>',
-        'FileComment: <text>Very long file</text>',
-        'FileAttributionText: <text>Acknowledgements that might be required to be communicated in some contexts.</text>'
+    file_str = "\n".join([
+        "FileName: testfile.java",
+        "SPDXID: SPDXRef-File",
+        "FileType: SOURCE",
+        "FileType: TEXT",
+        "FileChecksum: SHA1: 2fd4e1c67a2d28fced849ee1bb76e7391b93eb12",
+        "LicenseConcluded: Apache-2.0",
+        "LicenseInfoInFile: Apache-2.0",
+        "FileCopyrightText: <text>Copyright 2014 Acme Inc.</text>",
+        "FileComment: <text>Very long file</text>",
+        "FileAttributionText: <text>Acknowledgements that might be required to be communicated in some contexts.</text>"
     ])
     document = parser.parse("\n".join([DOCUMENT_STR, file_str]))
     assert document is not None
     assert len(document.files) == 1
     spdx_file = document.files[0]
-    assert spdx_file.name == 'testfile.java'
-    assert spdx_file.spdx_id == 'SPDXRef-File'
+    assert spdx_file.name == "testfile.java"
+    assert spdx_file.spdx_id == "SPDXRef-File"
     assert spdx_file.file_type == [FileType.SOURCE, FileType.TEXT]
-    assert spdx_file.comment == 'Very long file'
+    assert spdx_file.comment == "Very long file"
     assert spdx_file.attribution_texts == [
-        'Acknowledgements that might be required to be communicated in some contexts.']
+        "Acknowledgements that might be required to be communicated in some contexts."]
     assert spdx_file.license_info_in_file == [get_spdx_licensing().parse("Apache-2.0")]
     assert spdx_file.license_concluded == get_spdx_licensing().parse("Apache-2.0")
 
 
 def test_parse_invalid_file():
     parser = Parser()
-    file_str = '\n'.join([
-        'FileName: testfile.java',
-        'SPDXID: SPDXRef-File',
-        'FileType: SOUCE',
-        'FileType: TEXT',
-        'FileChecksum: SHA3: 2fd4e1c67a2d28fced849ee1bb76e7391b93eb12',
-        'LicenseConcluded: Apache-2.0',
-        'LicenseInfoInFile: Apache-2.0',
-        'FileCopyrightText: <text>Copyright 2014 Acme Inc.</text>',
-        'FileComment: <text>Very long file</text>',
-        'FileAttributionText: <text>Acknowledgements that might be required to be communicated in some contexts.</text>'
+    file_str = "\n".join([
+        "FileName: testfile.java",
+        "SPDXID: SPDXRef-File",
+        "FileType: SOUCE",
+        "FileType: TEXT",
+        "FileChecksum: SHA3: 2fd4e1c67a2d28fced849ee1bb76e7391b93eb12",
+        "LicenseConcluded: Apache-2.0",
+        "LicenseInfoInFile: Apache-2.0",
+        "FileCopyrightText: <text>Copyright 2014 Acme Inc.</text>",
+        "FileComment: <text>Very long file</text>",
+        "FileAttributionText: <text>Acknowledgements that might be required to be communicated in some contexts.</text>"
     ])
 
     with pytest.raises(SPDXParsingError) as err: