From 1d3c59cc440e09bbb65e3e427f31090ef08d0b44 Mon Sep 17 00:00:00 2001
From: clenk <clenk@mitre.org>
Date: Wed, 5 Jul 2017 13:21:06 -0400
Subject: [PATCH] Move TLP constants up to stix2 namespace

---
 stix2/__init__.py           | 3 ++-
 stix2/test/test_markings.py | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/stix2/__init__.py b/stix2/__init__.py
index 392e947..25e160a 100644
--- a/stix2/__init__.py
+++ b/stix2/__init__.py
@@ -15,7 +15,8 @@ from .observables import (URL, AlternateDataStream, ArchiveExt, Artifact,
                           WindowsProcessExt, WindowsRegistryKey,
                           WindowsRegistryValueType, WindowsServiceExt,
                           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)
 from .sdo import (AttackPattern, Campaign, CourseOfAction, Identity, Indicator,
                   IntrusionSet, Malware, ObservedData, Report, ThreatActor,
diff --git a/stix2/test/test_markings.py b/stix2/test/test_markings.py
index c2e0276..ebfa480 100644
--- a/stix2/test/test_markings.py
+++ b/stix2/test/test_markings.py
@@ -4,7 +4,7 @@ import pytest
 import pytz
 
 import stix2
-from stix2.other import TLP_WHITE
+from stix2 import TLP_WHITE
 
 from .constants import MARKING_DEFINITION_ID