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

Remove registration._get_extension_class() since it's redundant 

with registry.class_for_type().
pull/1/head
Michael Chisholm 2021-07-09 18:11:11 -04:00
parent 34e82e489f
commit e99be67c1e
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
stix2/custom.py
View File

@ -3,9 +3,10 @@ from collections import OrderedDict
from .base import _cls_init from .base import _cls_init
from .properties import EnumProperty from .properties import EnumProperty
from .registration import ( from .registration import (
_get_extension_class, _register_extension, _register_marking, _register_extension, _register_marking, _register_object,
_register_object, _register_observable, _register_observable,
) )
from .registry import class_for_type
def _get_properties_dict(properties): def _get_properties_dict(properties):
@ -34,7 +35,7 @@ def _custom_object_builder(cls, type, properties, version, base_class):
if ext and version != '2.0': if ext and version != '2.0':
if 'extensions' not in self._inner: if 'extensions' not in self._inner:
self._inner['extensions'] = {} self._inner['extensions'] = {}
self._inner['extensions'][ext] = _get_extension_class(ext, version)() self._inner['extensions'][ext] = class_for_type(ext, version, "extensions")()
_CustomObject.__name__ = cls.__name__ _CustomObject.__name__ = cls.__name__
@ -80,7 +81,7 @@ def _custom_observable_builder(cls, type, properties, version, base_class, id_co
if ext and version != '2.0': if ext and version != '2.0':
if 'extensions' not in self._inner: if 'extensions' not in self._inner:
self._inner['extensions'] = {} self._inner['extensions'] = {}
self._inner['extensions'][ext] = _get_extension_class(ext, version)() self._inner['extensions'][ext] = class_for_type(ext, version, "extensions")()
_CustomObservable.__name__ = cls.__name__ _CustomObservable.__name__ = cls.__name__

5
stix2/registration.py
View File

@ -132,11 +132,6 @@ def _register_observable(new_observable, version=version.DEFAULT_VERSION):
OBJ_MAP_OBSERVABLE[new_observable._type] = new_observable OBJ_MAP_OBSERVABLE[new_observable._type] = new_observable
def _get_extension_class(extension_uuid, version):
"""Retrieve a registered class Extension"""
return registry.STIX2_OBJ_MAPS[version]['extensions'].get(extension_uuid)
def _register_extension( def _register_extension(
new_extension, version=version.DEFAULT_VERSION, new_extension, version=version.DEFAULT_VERSION,
): ):