8000 squashed review commits concerning structure, double quotes and naming · HarshvMahawar/tools-python@08ad4df · GitHub
[go: up one dir, main page]
Skip to content

Commit 08ad4df

Browse files
meretpmeretp
committed
squashed review commits concerning structure, double quotes and naming
[review] use double quotes [review] change file structure of tag value parser [review] rename Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
1 parent 8039b09 commit 08ad4df

19 files changed

+526
-517
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ __pycache__/
44
/build/
55
/dist/
66
/tmp/
7-
src/spdx/parser/tagvalue/parser/parsetab.py
7+
src/spdx/parser/tagvalue/parsetab.py
88
/.cache/
99

1010
.tox

‎src/spdx/parser/parse_anything.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from spdx.formats import file_name_to_format, FileFormat
1212
from spdx.parser.json import json_parser
1313
from spdx.parser.rdf import rdf_parser
14-
from spdx.parser.tagvalue.parser import tagvalue_parser
14+
from spdx.parser.tagvalue import tagvalue_parser
1515
from spdx.parser.xml import xml_parser
1616
from spdx.parser.yaml import yaml_parser
1717

‎src/spdx/parser/tagvalue/lexer/__init__.py renamed to ‎src/spdx/parser/tagvalue/__init__.py

File renamed without changes.

‎src/spdx/parser/tagvalue/parser/helper_methods.py renamed to ‎src/spdx/parser/tagvalue/helper_methods.py

File renamed without changes.

‎src/spdx/parser/tagvalue/lexer/tagvalue.py renamed to ‎src/spdx/parser/tagvalue/lexer.py

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class SPDXLexer(object):
2828
"Creator": "CREATOR",
2929
"Created": "CREATED",
3030
"CreatorComment": "CREATOR_COMMENT",
31-
"LicenseListVersion": "LIC_LIST_VER",
31+
"LicenseListVersion": "LICENSE_LIST_VERSION",
3232
# Annotation fields
3333
"Annotator": "ANNOTATOR",
3434
"AnnotationDate": "ANNOTATION_DATE",
@@ -41,25 +41,25 @@ class SPDXLexer(object):
4141
# Package fields
4242
"PackageName": "PKG_NAME",
4343
"PackageVersion": "PKG_VERSION",
44-
"PackageDownloadLocation": "PKG_DOWN",
44+
"PackageDownloadLocation": "PKG_DOWWNLOAD_LOCATION",
4545
"FilesAnalyzed": "PKG_FILES_ANALYZED",
46-
"PackageSummary": "PKG_SUM",
47-
"PackageSourceInfo": "PKG_SRC_INFO",
46+
"PackageSummary": "PKG_SUMMARY",
47+
"PackageSourceInfo": "PKG_SOURCE_INFO",
4848
"PackageFileName": "PKG_FILE_NAME",
49-
"PackageSupplier": "PKG_SUPPL",
50-
"PackageOriginator": "PKG_ORIG",
49+
"PackageSupplier": "PKG_SUPPLIER",
50+
"PackageOriginator": "PKG_ORIGINATOR",
5151
"PackageChecksum": "PKG_CHECKSUM",
52-
"PackageVerificationCode": "PKG_VERF_CODE",
53-
"PackageDescription": "PKG_DESC",
52+
"PackageVerificationCode": "PKG_VERIFICATION_CODE",
53+
"PackageDescription": "PKG_DESCRIPTION",
5454
"PackageComment": "PKG_COMMENT",
55-
"PackageLicenseDeclared": "PKG_LICS_DECL",
56-
"PackageLicenseConcluded": "PKG_LICS_CONC",
57-
"PackageLicenseInfoFromFiles": "PKG_LICS_FFILE",
58-
"PackageLicenseComments": "PKG_LICS_COMMENT",
59-
"PackageCopyrightText": "PKG_CPY_TEXT",
60-
"PackageHomePage": "PKG_HOME",
61-
"ExternalRef": "PKG_EXT_REF",
62-
"ExternalRefComment": "PKG_EXT_REF_COMMENT",
55+
"PackageLicenseDeclared": "PKG_LICENSE_DECLARED",
56+
"PackageLicenseConcluded": "PKG_LICENSE_CONCLUDED",
57+
"PackageLicenseInfoFromFiles": "PKG_LICENSE_INFO",
58+
"PackageLicenseComments": "PKG_LICENSE_COMMENT",
59+
"PackageCopyrightText": "PKG_COPYRIGHT_TEXT",
60+
"PackageHomePage": "PKG_HOMEPAGE",
61+
"ExternalRef": "PKG_EXTERNAL_REF",
62+
"ExternalRefComment": "PKG_EXTERNAL_REF_COMMENT",
6363
"PackageAttributionText": "PKG_ATTRIBUTION_TEXT",
6464
"PrimaryPackagePurpose": "PRIMARY_PACKAGE_PURPOSE",
6565
"BuiltDate": "BUILT_DATE",
@@ -69,29 +69,29 @@ class SPDXLexer(object):
6969
"FileName": "FILE_NAME",
7070
"FileType": "FILE_TYPE",
7171
"FileChecksum": "FILE_CHECKSUM",
72-
"LicenseConcluded": "FILE_LICS_CONC",
73-
"LicenseInfoInFile": "FILE_LICS_INFO",
74-
"FileCopyrightText": "FILE_CR_TEXT",
75-
"LicenseComments": "FILE_LICS_COMMENT",
72+
"LicenseConcluded": "FILE_LICENSE_CONCLUDED",
73+
"LicenseInfoInFile": "FILE_LICENSE_INFO",
74+
"FileCopyrightText": "FILE_COPYRIGHT_TEXT",
75+
"LicenseComments": "FILE_LICENSE_COMMENT",
7676
"FileComment": "FILE_COMMENT",
7777
"FileNotice": "FILE_NOTICE",
78-
"FileContributor": "FILE_CONTRIB",
78+
"FileContributor": "FILE_CONTRIBUTOR",
7979
"FileAttributionText": "FILE_ATTRIBUTION_TEXT",
8080
# ExtractedLicensingInfo fields
81-
"LicenseID": "LICS_ID",
82-
"ExtractedText": "LICS_TEXT",
83-
"LicenseName": "LICS_NAME",
84-
"LicenseCrossReference": "LICS_CRS_REF",
85-
"LicenseComment": "LICS_COMMENT",
81+
"LicenseID": "LICENSE_ID",
82+
"ExtractedText": "LICENSE_TEXT",
83+
"LicenseName": "LICENSE_NAME",
84+
"LicenseCrossReference": "LICENSE_CROSS_REF",
85+
"LicenseComment": "LICENSE_COMMENT",
8686
# Snippet fields
8787
"SnippetSPDXID": "SNIPPET_SPDX_ID",
8888
"SnippetName": "SNIPPET_NAME",
89 8000 89
"SnippetComment": "SNIPPET_COMMENT",
90-
"SnippetCopyrightText": "SNIPPET_CR_TEXT",
91-
"SnippetLicenseComments": "SNIPPET_LICS_COMMENT",
90+
"SnippetCopyrightText": "SNIPPET_COPYRIGHT_TEXT",
91+
"SnippetLicenseComments": "SNIPPET_LICENSE_COMMENT",
9292
"SnippetFromFileSPDXID": "SNIPPET_FILE_SPDXID",
93-
"SnippetLicenseConcluded": "SNIPPET_LICS_CONC",
94-
"LicenseInfoInSnippet": "SNIPPET_LICS_INFO",
93+
"SnippetLicenseConcluded": "SNIPPET_LICENSE_CONCLUDED",
94+
"LicenseInfoInSnippet": "SNIPPET_LICENSE_INFO",
9595
"SnippetAttributionText": "SNIPPET_ATTRIBUTION_TEXT",
9696
"SnippetByteRange": "SNIPPET_BYTE_RANGE",
9797
"SnippetLineRange": "SNIPPET_LINE_RANGE",
@@ -105,13 +105,13 @@ class SPDXLexer(object):
105105
"TEXT",
106106
"TOOL_VALUE",
107107
"UNKNOWN_TAG",
108-
"ORG_VALUE",
108+
"ORGANIZATION_VALUE",
109109
"PERSON_VALUE",
110110
"DATE",
111111
"LINE",
112112
"CHECKSUM",
113-
"DOC_REF_ID",
114-
"DOC_URI",
113+
"EXT_DOC_REF_ID",
114+
"EXT_DOC_URI",
115115
"EXT_DOC_REF_CHECKSUM",
116116
] + list(reserved.values())
117117

@@ -146,12 +146,12 @@ def t_CHECKSUM(self, t):
146146
return t
147147

148148
@TOKEN(r":\s*DocumentRef-([A-Za-z0-9\+\.\-]+)")
149-
def t_DOC_REF_ID(self, t):
149+
def t_EXT_DOC_REF_ID(self, t):
150150
t.value = t.value[1:].strip()
151151
return t
152152

153153
@TOKEN(r"\s*((ht|f)tps?:\/\/\S*)")
154-
def t_DOC_URI(self, t):
154+
def t_EXT_DOC_URI(self, t):
155155
t.value = t.value.strip()
156156
return t
157157

@@ -166,7 +166,7 @@ def t_TOOL_VALUE(self, t):
166166
return t
167167

168168
@TOKEN(r":\s*Organization:.+")
169-
def t_ORG_VALUE(self, t):
169+
def t_ORGANIZATION_VALUE(self, t):
170170
t.value = t.value[1:].strip()
171171
return t
172172

0 commit comments

Comments
 (0)
0