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

adding documentation on specific lines, typos, and a bit of extra code

pull/1/head
Emmanuelle Vargas-Gonzalez 2021-04-15 12:28:58 -04:00
parent 547273208a
commit 5d83d44d0e
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
stix2/base.py
View File

@ -119,8 +119,14 @@ class _STIXBase(collections.abc.Mapping):
if extra_kwargs and not self._allow_custom: if extra_kwargs and not self._allow_custom:
ext_found = False ext_found = False
# This section performs a check on top-level objects that support extensions.
# If extra_kwargs is not empty, allow_custom False, and the extension_type is not
# toplevel then we raise the ExtraPropertiesError regardless.
for key_id, ext_def in kwargs.get('extensions', {}).items(): for key_id, ext_def in kwargs.get('extensions', {}).items():
if key_id.startswith('extension-definition--'): if (
key_id.startswith('extension-definition--') and
ext_def.get('extension_type', '') == 'toplevel-property-extension'
):
ext_found = True ext_found = True
break break
if ext_found is False: if ext_found is False:
@ -150,6 +156,10 @@ class _STIXBase(collections.abc.Mapping):
required_properties = set(get_required_properties(self._properties)) required_properties = set(get_required_properties(self._properties))
missing_kwargs = required_properties - set(setting_kwargs) missing_kwargs = required_properties - set(setting_kwargs)
if missing_kwargs: if missing_kwargs:
# In this scenario, we are inside within the scope of the extension.
# It is possible to check if this is a new Extension Class by
# querying "extension_type". Note: There is an API limitation currently
# because a toplevel-property-extension cannot validate its parent properties
new_ext_check = ( new_ext_check = (
bool(getattr(self, "extension_type", None)) bool(getattr(self, "extension_type", None))
and issubclass(cls, stix2.v21._Extension) and issubclass(cls, stix2.v21._Extension)

2
stix2/properties.py
View File

@ -117,7 +117,7 @@ class Property(object):
creating an object with that property. No default value exists for creating an object with that property. No default value exists for
these properties. (Default: ``False``) these properties. (Default: ``False``)
fixed: This provides a constant default value. Users are free to fixed: This provides a constant default value. Users are free to
provide this value explicity when constructing an object (which provide this value explicitly when constructing an object (which
allows you to copy **all** values from an existing object to a new allows you to copy **all** values from an existing object to a new
object), but if the user provides a value other than the ``fixed`` object), but if the user provides a value other than the ``fixed``
value, it will raise an error. This is semantically equivalent to value, it will raise an error. This is semantically equivalent to