diff --git a/stix2/markings/__init__.py b/stix2/markings/__init__.py index b0dba6b..6d09f81 100644 --- a/stix2/markings/__init__.py +++ b/stix2/markings/__init__.py @@ -55,7 +55,7 @@ def get_markings(obj, selectors=None, inherited=False, descendants=False, markin inherited, descendants, marking_ref, - lang + lang, ) if inherited: diff --git a/stix2/markings/granular_markings.py b/stix2/markings/granular_markings.py index a1c8479..5456f83 100644 --- a/stix2/markings/granular_markings.py +++ b/stix2/markings/granular_markings.py @@ -2,7 +2,7 @@ from stix2 import exceptions from stix2.markings import utils -from stix2.utils import new_version, is_marking +from stix2.utils import is_marking, new_version def get_markings(obj, selectors, inherited=False, descendants=False, marking_ref=True, lang=True): @@ -212,7 +212,7 @@ def clear_markings(obj, selectors, marking_ref=True, lang=True): granular_dict = utils.build_granular_marking([ {'selectors': selectors, 'marking_ref': 'N/A'}, - {'selectors': selectors, 'lang': 'N/A'} + {'selectors': selectors, 'lang': 'N/A'}, ]) clear = granular_dict.get('granular_markings', []) diff --git a/stix2/test/v21/test_granular_markings.py b/stix2/test/v21/test_granular_markings.py index 5d70063..e178f86 100644 --- a/stix2/test/v21/test_granular_markings.py +++ b/stix2/test/v21/test_granular_markings.py @@ -478,7 +478,7 @@ GET_MARKINGS_TEST_DATA_LANGS = { @pytest.mark.parametrize("data", [GET_MARKINGS_TEST_DATA_LANGS]) -def test_get_markings_multiple_selectors(data): +def test_get_markings_multiple_selectors_langs(data): """Test multiple selectors return combination of markings.""" total = markings.get_markings(data, ["x.y", "x.z"]) xy_markings = markings.get_markings(data, ["x.y"])