Fix silly isort check errors..

stix2/__init__.py

@@ -24,6 +24,12 @@
    v21.observables
    v21.sdo
    v21.sro
+
+   The .v21 import can't be relocated, or we get circular import problems.
+   The 'isort:skip' line comment didn't work to skip only that one problematic
+   import.  The only thing that did was telling it to skip the whole file.
+
+   isort:skip_file
 """
 
 # flake8: noqa

stix2/datastore/filesystem.py

@@ -6,8 +6,8 @@ Python STIX 2.0 FileSystem Source/Sink
 import json
 import os
 
-from stix2.core import parse
 from stix2 import Bundle
+from stix2.core import parse
 from stix2.datastore import DataSink, DataSource, DataStoreMixin
 from stix2.datastore.filters import Filter, FilterSet, apply_common_filters
 from stix2.utils import deduplicate, get_class_hierarchy_names

stix2/datastore/memory.py

@@ -15,9 +15,9 @@ Note:
 import json
 import os
 
+from stix2 import Bundle
 from stix2.base import _STIXBase
 from stix2.core import parse
-from stix2 import Bundle
 from stix2.datastore import DataSink, DataSource, DataStoreMixin
 from stix2.datastore.filters import Filter, FilterSet, apply_common_filters
 

stix2/datastore/taxii.py

@@ -3,9 +3,9 @@ Python STIX 2.x TAXIICollectionStore
 """
 from requests.exceptions import HTTPError
 
+from stix2 import Bundle
 from stix2.base import _STIXBase
 from stix2.core import parse
-from stix2 import Bundle
 from stix2.datastore import (DataSink, DataSource, DataSourceError,
                              DataStoreMixin)
 from stix2.datastore.filters import Filter, FilterSet, apply_common_filters

stix2/test/test_workbench.py

@@ -1,6 +1,7 @@
 import os
 
 import stix2
+from stix2 import Bundle
 from stix2.workbench import (AttackPattern, Campaign, CourseOfAction,
                              ExternalReference, FileSystemSource, Filter,
                              Identity, Indicator, IntrusionSet, Malware,
@@ -14,7 +15,6 @@ from stix2.workbench import (AttackPattern, Campaign, CourseOfAction,
                              set_default_creator, set_default_external_refs,
                              set_default_object_marking_refs, threat_actors,
                              tools, vulnerabilities)
-from stix2 import Bundle
 
 from .constants import (ATTACK_PATTERN_ID, ATTACK_PATTERN_KWARGS, CAMPAIGN_ID,
                         CAMPAIGN_KWARGS, COURSE_OF_ACTION_ID,

stix2/v20/bundle.py

@@ -2,9 +2,9 @@ from collections import OrderedDict
 
 from stix2 import parse
 from stix2.base import _STIXBase
-from stix2.properties import TypeProperty, IDProperty, StringProperty, \
+from stix2.properties import (IDProperty, ListProperty, Property,
-    ListProperty, Property
+                              StringProperty, TypeProperty)
-from stix2.utils import get_class_hierarchy_names, _get_dict
+from stix2.utils import _get_dict, get_class_hierarchy_names
 
 
 class STIXObjectProperty(Property):

stix2/v21/bundle.py

@@ -2,8 +2,8 @@ from collections import OrderedDict
 
 from stix2 import parse
 from stix2.base import _STIXBase
-from stix2.properties import TypeProperty, IDProperty, ListProperty, Property
+from stix2.properties import IDProperty, ListProperty, Property, TypeProperty
-from stix2.utils import get_class_hierarchy_names, _get_dict
+from stix2.utils import _get_dict, get_class_hierarchy_names
 
 
 class STIXObjectProperty(Property):