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

Merge branch 'master' of github.com:oasis-open/cti-python-stix2

master
chrisr3d 2019-02-08 15:24:22 +01:00
parent 469d17bcee 69d2529f0e
commit f049c98d43
5 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/guide/creating.ipynb
View File

@ -498,7 +498,7 @@
"source": [ "source": [
"As with indicators, the ``type``, ``id``, ``created``, and ``modified`` properties will be set automatically if not provided. For Malware objects, the ``labels`` and ``name`` properties must be provided.\n", "As with indicators, the ``type``, ``id``, ``created``, and ``modified`` properties will be set automatically if not provided. For Malware objects, the ``labels`` and ``name`` properties must be provided.\n",
"\n", "\n",
"You can see the full list of SDO classes [here](../api/stix2.v20.sdo.rst)." "You can see the full list of SDO classes [here](../api/v20/stix2.v20.sdo.rst)."
] ]
}, },
{ {

2
stix2/markings/utils.py
View File

@ -39,7 +39,7 @@ def _validate_selector(obj, selector):
def _get_marking_id(marking): def _get_marking_id(marking):
if type(marking).__name__ is 'MarkingDefinition': # avoid circular import if type(marking).__name__ == 'MarkingDefinition': # avoid circular import
return marking.id return marking.id
return marking return marking

2
stix2/properties.py
View File

@ -150,7 +150,7 @@ class ListProperty(Property):
if type(self.contained) is EmbeddedObjectProperty: if type(self.contained) is EmbeddedObjectProperty:
obj_type = self.contained.type obj_type = self.contained.type
elif type(self.contained).__name__ is "STIXObjectProperty": elif type(self.contained).__name__ == "STIXObjectProperty":
# ^ this way of checking doesn't require a circular import # ^ this way of checking doesn't require a circular import
# valid is already an instance of a python-stix2 class; no need # valid is already an instance of a python-stix2 class; no need
# to turn it into a dictionary and then pass it to the class # to turn it into a dictionary and then pass it to the class

24
stix2/test/v20/test_observed_data.py
View File

@ -1095,11 +1095,11 @@ def test_process_example_empty_error():
def test_process_example_empty_with_extensions(): def test_process_example_empty_with_extensions():
with pytest.raises(stix2.exceptions.AtLeastOnePropertyError) as excinfo: with pytest.raises(stix2.exceptions.AtLeastOnePropertyError) as excinfo:
stix2.v20.Process( stix2.v20.Process(
extensions={ extensions={
"windows-process-ext": {}, "windows-process-ext": {},
}, },
) )
assert excinfo.value.cls == stix2.v20.WindowsProcessExt assert excinfo.value.cls == stix2.v20.WindowsProcessExt
properties_of_extension = list(stix2.v20.WindowsProcessExt._properties.keys()) properties_of_extension = list(stix2.v20.WindowsProcessExt._properties.keys())
@ -1127,13 +1127,13 @@ def test_process_example_windows_process_ext():
def test_process_example_windows_process_ext_empty(): def test_process_example_windows_process_ext_empty():
with pytest.raises(stix2.exceptions.AtLeastOnePropertyError) as excinfo: with pytest.raises(stix2.exceptions.AtLeastOnePropertyError) as excinfo:
stix2.v20.Process( stix2.v20.Process(
pid=1221, pid=1221,
name="gedit-bin", name="gedit-bin",
extensions={ extensions={
"windows-process-ext": {}, "windows-process-ext": {},
}, },
) )
assert excinfo.value.cls == stix2.v20.WindowsProcessExt assert excinfo.value.cls == stix2.v20.WindowsProcessExt
properties_of_extension = list(stix2.v20.WindowsProcessExt._properties.keys()) properties_of_extension = list(stix2.v20.WindowsProcessExt._properties.keys())

18
stix2/test/v21/test_observed_data.py
View File

@ -1073,9 +1073,9 @@ def test_process_example_empty_error():
def test_process_example_empty_with_extensions(): def test_process_example_empty_with_extensions():
with pytest.raises(stix2.exceptions.AtLeastOnePropertyError) as excinfo: with pytest.raises(stix2.exceptions.AtLeastOnePropertyError) as excinfo:
stix2.v21.Process(extensions={ stix2.v21.Process(extensions={
"windows-process-ext": {}, "windows-process-ext": {},
}) })
assert excinfo.value.cls == stix2.v21.WindowsProcessExt assert excinfo.value.cls == stix2.v21.WindowsProcessExt
properties_of_extension = list(stix2.v21.WindowsProcessExt._properties.keys()) properties_of_extension = list(stix2.v21.WindowsProcessExt._properties.keys())
@ -1102,12 +1102,12 @@ def test_process_example_windows_process_ext():
def test_process_example_windows_process_ext_empty(): def test_process_example_windows_process_ext_empty():
with pytest.raises(stix2.exceptions.AtLeastOnePropertyError) as excinfo: with pytest.raises(stix2.exceptions.AtLeastOnePropertyError) as excinfo:
stix2.v21.Process( stix2.v21.Process(
pid=1221, pid=1221,
extensions={ extensions={
"windows-process-ext": {}, "windows-process-ext": {},
}, },
) )
assert excinfo.value.cls == stix2.v21.WindowsProcessExt assert excinfo.value.cls == stix2.v21.WindowsProcessExt
properties_of_extension = list(stix2.v21.WindowsProcessExt._properties.keys()) properties_of_extension = list(stix2.v21.WindowsProcessExt._properties.keys())