diff --git a/stix2/test/test_datastore_filesystem.py b/stix2/test/test_datastore_filesystem.py index bd1f02c..4139ab1 100644 --- a/stix2/test/test_datastore_filesystem.py +++ b/stix2/test/test_datastore_filesystem.py @@ -7,7 +7,6 @@ import pytest from stix2 import (Bundle, Campaign, CustomObject, FileSystemSink, FileSystemSource, FileSystemStore, Filter, Identity, Indicator, Malware, Relationship, properties) - from stix2.test.constants import (CAMPAIGN_ID, CAMPAIGN_KWARGS, IDENTITY_ID, IDENTITY_KWARGS, INDICATOR_ID, INDICATOR_KWARGS, MALWARE_ID, MALWARE_KWARGS, diff --git a/stix2/test/test_datastore_filters.py b/stix2/test/test_datastore_filters.py index 8803e4b..5ffd051 100644 --- a/stix2/test/test_datastore_filters.py +++ b/stix2/test/test_datastore_filters.py @@ -4,7 +4,6 @@ from stix2 import parse from stix2.datastore.filters import Filter, apply_common_filters from stix2.utils import STIXdatetime, parse_into_datetime - stix_objs = [ { "created": "2017-01-27T13:49:53.997Z", diff --git a/stix2/test/test_datastore_memory.py b/stix2/test/test_datastore_memory.py index dcec813..7a5bf10 100644 --- a/stix2/test/test_datastore_memory.py +++ b/stix2/test/test_datastore_memory.py @@ -2,7 +2,7 @@ import pytest from stix2.datastore import CompositeDataSource, make_id from stix2.datastore.filters import Filter -from stix2.datastore.memory import MemorySource, MemorySink +from stix2.datastore.memory import MemorySink, MemorySource def test_add_remove_composite_datasource(): diff --git a/stix2/test/test_datastore_taxii.py b/stix2/test/test_datastore_taxii.py index dd81cd4..f3b4f64 100644 --- a/stix2/test/test_datastore_taxii.py +++ b/stix2/test/test_datastore_taxii.py @@ -1,12 +1,12 @@ -from stix2 import (Bundle, ThreatActor, TAXIICollectionSink, - TAXIICollectionSource, TAXIICollectionStore) -from stix2.datastore.filters import Filter - import json -import pytest -from taxii2client import Collection, _filter_kwargs_to_query_params from medallion.filters.basic_filter import BasicFilter +import pytest +from taxii2client import Collection, _filter_kwargs_to_query_params + +from stix2 import (Bundle, TAXIICollectionSink, TAXIICollectionSource, + TAXIICollectionStore, ThreatActor) +from stix2.datastore.filters import Filter COLLECTION_URL = 'https://example.com/api1/collections/91a7b528-80eb-42ed-a74d-c6fbd5a26116/'