diff --git a/stix2/test/v20/test_datastore_memory.py b/stix2/test/v20/test_datastore_memory.py index f9adc4f..2cb0a1c 100644 --- a/stix2/test/v20/test_datastore_memory.py +++ b/stix2/test/v20/test_datastore_memory.py @@ -3,10 +3,10 @@ import shutil import pytest -from stix2 import (Filter, MemorySource, MemoryStore, properties) +from stix2 import Filter, MemorySource, MemoryStore, properties +from stix2.datastore import make_id from stix2.v20 import (Bundle, Campaign, CustomObject, Identity, Indicator, Malware, Relationship) -from stix2.datastore import make_id from .constants import (CAMPAIGN_ID, CAMPAIGN_KWARGS, IDENTITY_ID, IDENTITY_KWARGS, INDICATOR_ID, INDICATOR_KWARGS, diff --git a/stix2/test/v20/test_granular_markings.py b/stix2/test/v20/test_granular_markings.py index b36bf65..797e810 100644 --- a/stix2/test/v20/test_granular_markings.py +++ b/stix2/test/v20/test_granular_markings.py @@ -2,8 +2,8 @@ import pytest from stix2 import markings -from stix2.v20 import Malware, TLP_RED from stix2.exceptions import MarkingNotFoundError +from stix2.v20 import TLP_RED, Malware from .constants import MALWARE_MORE_KWARGS as MALWARE_KWARGS_CONST from .constants import MARKING_IDS diff --git a/stix2/test/v21/test_datastore_memory.py b/stix2/test/v21/test_datastore_memory.py index 5caea9d..56eea14 100644 --- a/stix2/test/v21/test_datastore_memory.py +++ b/stix2/test/v21/test_datastore_memory.py @@ -3,10 +3,10 @@ import shutil import pytest -from stix2 import (Filter, MemorySource, MemoryStore, properties) +from stix2 import Filter, MemorySource, MemoryStore, properties +from stix2.datastore import make_id from stix2.v21 import (Bundle, Campaign, CustomObject, Identity, Indicator, Malware, Relationship) -from stix2.datastore import make_id from .constants import (CAMPAIGN_ID, CAMPAIGN_KWARGS, IDENTITY_ID, IDENTITY_KWARGS, INDICATOR_ID, INDICATOR_KWARGS, diff --git a/stix2/test/v21/test_granular_markings.py b/stix2/test/v21/test_granular_markings.py index b606742..eb08fb2 100644 --- a/stix2/test/v21/test_granular_markings.py +++ b/stix2/test/v21/test_granular_markings.py @@ -1,8 +1,8 @@ import pytest from stix2 import markings -from stix2.v21 import Malware, TLP_RED from stix2.exceptions import MarkingNotFoundError +from stix2.v21 import TLP_RED, Malware from .constants import MALWARE_MORE_KWARGS as MALWARE_KWARGS_CONST from .constants import MARKING_IDS