Skip to content

Commit 022522d

Browse files
committed
refactor: format dictionary unpacking for improved readability in xlsx_to_oscal_poam
Signed-off-by: allanilya <allanilyasov@gmail.com>
1 parent b4871fa commit 022522d

2 files changed

Lines changed: 14 additions & 10 deletions

File tree

tests/trestle/tasks/xlsx_to_oscal_poam_test.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,9 @@
1616

1717
import configparser
1818
import datetime
19-
import os
2019
import pathlib
2120
import uuid
2221

23-
from tests.test_utils import text_files_similar
24-
2522
from trestle.oscal.poam import PlanOfActionAndMilestones
2623
from trestle.tasks.base_task import TaskOutcome
2724
from trestle.tasks.xlsx_to_oscal_poam import PoamBuilder, PoamValidator, PoamXlsxHelper, UUIDManager, XlsxToOscalPoam

trestle/tasks/xlsx_to_oscal_poam.py

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,9 @@ def create_poam_item(self, poam_id: str, row_data: Dict[str, Any]) -> PoamItem:
476476
props=props or None,
477477
links=None,
478478
origins=None,
479-
**{'related-findings': None, 'related-observations': None, 'related-risks': None},
479+
**{
480+
'related-findings': None, 'related-observations': None, 'related-risks': None
481+
},
480482
)
481483

482484
# Add remarks if present
@@ -654,9 +656,8 @@ def add_property_if_valid(name: str, value: Any) -> None:
654656

655657
return risk
656658

657-
def _create_milestone_tasks(
658-
self, poam_id: str, milestones: List[Dict[str, Any]], helper: PoamXlsxHelper
659-
) -> List[OscalTask]:
659+
def _create_milestone_tasks(self, poam_id: str, milestones: List[Dict[str, Any]],
660+
helper: PoamXlsxHelper) -> List[OscalTask]:
660661
"""
661662
Create OSCAL Task objects from milestone data.
662663
@@ -697,7 +698,9 @@ def _create_milestone_tasks(
697698
links=None,
698699
dependencies=None,
699700
subjects=None,
700-
**{'associated-activities': None, 'responsible-roles': None},
701+
**{
702+
'associated-activities': None, 'responsible-roles': None
703+
},
701704
)
702705
tasks.append(task)
703706

@@ -1004,7 +1007,9 @@ def _create_poam(
10041007
metadata = Metadata(
10051008
title=self._title,
10061009
version=self._version,
1007-
**{'last-modified': self._timestamp, 'oscal-version': OSCAL_VERSION},
1010+
**{
1011+
'last-modified': self._timestamp, 'oscal-version': OSCAL_VERSION
1012+
},
10081013
)
10091014

10101015
# Optional system-id
@@ -1018,7 +1023,9 @@ def _create_poam(
10181023
metadata=metadata,
10191024
observations=observations or None,
10201025
risks=risks or None,
1021-
**{'system-id': system_id, 'poam-items': poam_items},
1026+
**{
1027+
'system-id': system_id, 'poam-items': poam_items
1028+
},
10221029
)
10231030

10241031
return poam

0 commit comments

Comments
 (0)