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

Move TLP constants up to stix2 namespace

stix2.1
clenk 2017-07-05 13:21:06 -04:00
parent f8e3a4f0e8
commit 1d3c59cc44
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
stix2/__init__.py
View File

@ -15,7 +15,8 @@ from .observables import (URL, AlternateDataStream, ArchiveExt, Artifact,
WindowsProcessExt, WindowsRegistryKey, WindowsProcessExt, WindowsRegistryKey,
WindowsRegistryValueType, WindowsServiceExt, WindowsRegistryValueType, WindowsServiceExt,
X509Certificate, X509V3ExtenstionsType) X509Certificate, X509V3ExtenstionsType)
from .other import (ExternalReference, GranularMarking, KillChainPhase, from .other import (TLP_AMBER, TLP_GREEN, TLP_RED, TLP_WHITE,
ExternalReference, GranularMarking, KillChainPhase,
MarkingDefinition, StatementMarking, TLPMarking) MarkingDefinition, StatementMarking, TLPMarking)
from .sdo import (AttackPattern, Campaign, CourseOfAction, Identity, Indicator, from .sdo import (AttackPattern, Campaign, CourseOfAction, Identity, Indicator,
IntrusionSet, Malware, ObservedData, Report, ThreatActor, IntrusionSet, Malware, ObservedData, Report, ThreatActor,

2
stix2/test/test_markings.py
View File

@ -4,7 +4,7 @@ import pytest
import pytz import pytz
import stix2 import stix2
from stix2.other import TLP_WHITE from stix2 import TLP_WHITE
from .constants import MARKING_DEFINITION_ID from .constants import MARKING_DEFINITION_ID