Skip to content

Commit 5c97c2d

Browse files
committed
coding standards and typing
Signed-off-by: Paul Horton <[email protected]>
1 parent abebd4f commit 5c97c2d

File tree

8 files changed

+11
-13
lines changed

8 files changed

+11
-13
lines changed

cyclonedx/model/bom.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
)
3939
from ..serialization import LicenseRepositoryHelper, UrnUuidHelper
4040
from . import ExternalReference, Property, ThisTool, Tool
41-
from .contact import OrganizationalContact, OrganizationalEntity
4241
from .bom_ref import BomRef
4342
from .component import Component
43+
from .contact import OrganizationalContact, OrganizationalEntity
4444
from .dependency import Dependable, Dependency
4545
from .license import License, LicenseExpression, LicenseRepository
4646
from .service import Service

cyclonedx/model/component.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
XsUri,
5555
_HashTypeRepositorySerializationHelper,
5656
)
57-
from .contact import OrganizationalContact, OrganizationalEntity
5857
from .bom_ref import BomRef
58+
from .contact import OrganizationalContact, OrganizationalEntity
5959
from .crypto import CryptoProperties
6060
from .dependency import Dependable
6161
from .issue import IssueType

cyclonedx/model/contact.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# Copyright (c) OWASP Foundation. All Rights Reserved.
1515

1616

17-
from typing import Optional, Union, Any, Iterable
17+
from typing import Any, Iterable, Optional, Union
1818

1919
import serializable
2020
from sortedcontainers import SortedSet
@@ -41,10 +41,8 @@ def __init__(self, *, bom_ref: Optional[Union[str, BomRef]] = None, country: Opt
4141
region: Optional[str] = None, locality: Optional[str] = None,
4242
post_office_box_number: Optional[str] = None, postal_code: Optional[str] = None,
4343
street_address: Optional[str] = None) -> None:
44-
if isinstance(bom_ref, BomRef):
45-
self._bom_ref = bom_ref
46-
else:
47-
self._bom_ref = BomRef(value=bom_ref) if bom_ref else None
44+
self._bom_ref = bom_ref if isinstance(bom_ref, BomRef) else BomRef(
45+
value=bom_ref) if bom_ref else None
4846
self.country = country
4947
self.region = region
5048
self.locality = locality
@@ -57,7 +55,7 @@ def __init__(self, *, bom_ref: Optional[Union[str, BomRef]] = None, country: Opt
5755
@serializable.type_mapping(BomRefHelper)
5856
@serializable.xml_attribute()
5957
@serializable.xml_name('bom-ref')
60-
def bom_ref(self) -> BomRef:
58+
def bom_ref(self) -> Optional[BomRef]:
6159
"""
6260
An optional identifier which can be used to reference the component elsewhere in the BOM. Every bom-ref MUST be
6361
unique within the BOM.

cyclonedx/model/service.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
from .._internal.compare import ComparableTuple as _ComparableTuple
3333
from ..schema.schema import SchemaVersion1Dot3, SchemaVersion1Dot4, SchemaVersion1Dot5, SchemaVersion1Dot6
3434
from . import DataClassification, ExternalReference, Property, XsUri
35-
from .contact import OrganizationalEntity
3635
from .bom_ref import BomRef
36+
from .contact import OrganizationalEntity
3737
from .dependency import Dependable
3838
from .license import License, LicenseRepository
3939
from .release_note import ReleaseNotes

cyclonedx/model/vulnerability.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
from ..schema.schema import SchemaVersion1Dot4, SchemaVersion1Dot5, SchemaVersion1Dot6
4444
from ..serialization import BomRefHelper
4545
from . import Property, Tool, XsUri
46-
from .contact import OrganizationalContact, OrganizationalEntity
4746
from .bom_ref import BomRef
47+
from .contact import OrganizationalContact, OrganizationalEntity
4848
from .impact_analysis import (
4949
ImpactAnalysisAffectedStatus,
5050
ImpactAnalysisJustification,

examples/complex_serialize.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
from cyclonedx.exception import MissingOptionalDependencyException
2424
from cyclonedx.factory.license import LicenseFactory
2525
from cyclonedx.model import XsUri
26-
from cyclonedx.model.contact import OrganizationalEntity
2726
from cyclonedx.model.bom import Bom
2827
from cyclonedx.model.component import Component, ComponentType
28+
from cyclonedx.model.contact import OrganizationalEntity
2929
from cyclonedx.output import make_outputter
3030
from cyclonedx.output.json import JsonV1Dot5
3131
from cyclonedx.schema import OutputFormat, SchemaVersion

tests/_data/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
Tool,
4242
XsUri,
4343
)
44-
from cyclonedx.model.contact import OrganizationalContact, OrganizationalEntity, PostalAddress
4544
from cyclonedx.model.bom import Bom, BomMetaData
4645
from cyclonedx.model.bom_ref import BomRef
4746
from cyclonedx.model.component import (
@@ -58,6 +57,7 @@
5857
Swhid,
5958
Swid,
6059
)
60+
from cyclonedx.model.contact import OrganizationalContact, OrganizationalEntity, PostalAddress
6161
from cyclonedx.model.crypto import (
6262
AlgorithmProperties,
6363
CertificateProperties,

tests/test_model_bom.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424

2525
from cyclonedx.exception.model import LicenseExpressionAlongWithOthersException
2626
from cyclonedx.model import Property, ThisTool, Tool
27-
from cyclonedx.model.contact import OrganizationalContact, OrganizationalEntity
2827
from cyclonedx.model.bom import Bom, BomMetaData
2928
from cyclonedx.model.bom_ref import BomRef
3029
from cyclonedx.model.component import Component, ComponentType
30+
from cyclonedx.model.contact import OrganizationalContact, OrganizationalEntity
3131
from cyclonedx.model.license import DisjunctiveLicense
3232
from tests._data.models import (
3333
get_bom_component_licenses_invalid,

0 commit comments

Comments
 (0)