MISP
/
cti-python-stix2
mirror of https://github.com/MISP/cti-python-stix2
2
0
Fork 0
Code Issues Releases Wiki Activity

Fixes #248

master
Desai, Kartikey H 2019-04-17 10:08:34 -04:00
parent f8d4669f80
commit e748923f19
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stix2/base.py
View File

@ -143,12 +143,12 @@ class _STIXBase(collections.Mapping):
if custom_props: if custom_props:
self.__allow_custom = True self.__allow_custom = True
# Remove any keyword arguments whose value is None # Remove any keyword arguments whose value is None or [] (i.e. empty list)
setting_kwargs = {} setting_kwargs = {}
props = kwargs.copy() props = kwargs.copy()
props.update(custom_props) props.update(custom_props)
for prop_name, prop_value in props.items(): for prop_name, prop_value in props.items():
if prop_value is not None: if prop_value is not None and prop_value != []:
setting_kwargs[prop_name] = prop_value setting_kwargs[prop_name] = prop_value
# Detect any missing required properties # Detect any missing required properties

2
stix2/test/v20/test_object_markings.py
View File

@ -107,7 +107,6 @@ def test_add_markings_combination():
"data", [ "data", [
([""]), ([""]),
(""), (""),
([]),
([MARKING_IDS[0], 456]), ([MARKING_IDS[0], 456]),
], ],
) )
@ -576,7 +575,6 @@ def test_set_marking():
@pytest.mark.parametrize( @pytest.mark.parametrize(
"data", [ "data", [
([]),
([""]), ([""]),
(""), (""),
([MARKING_IDS[4], 687]), ([MARKING_IDS[4], 687]),

2
stix2/test/v21/test_object_markings.py
View File

@ -106,7 +106,6 @@ def test_add_markings_combination():
"data", [ "data", [
([""]), ([""]),
(""), (""),
([]),
([MARKING_IDS[0], 456]), ([MARKING_IDS[0], 456]),
], ],
) )
@ -575,7 +574,6 @@ def test_set_marking():
@pytest.mark.parametrize( @pytest.mark.parametrize(
"data", [ "data", [
([]),
([""]), ([""]),
(""), (""),
([MARKING_IDS[4], 687]), ([MARKING_IDS[4], 687]),