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

Adjust import order to satisfy tox import check

revert-222-multi_version_filesystem_store
Michael Chisholm 2018-11-01 17:15:36 -04:00
parent ee57596d6a
commit e2d9325356
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stix2/datastore/filesystem.py
View File

@ -6,16 +6,16 @@ Python STIX 2.0 FileSystem Source/Sink
import errno import errno
import json import json
import os import os
import pytz
import stat import stat
import pytz
import six import six
from stix2.base import _STIXBase from stix2.base import _STIXBase
from stix2.core import Bundle, parse from stix2.core import Bundle, parse
from stix2.datastore import DataSink, DataSource, DataStoreMixin from stix2.datastore import DataSink, DataSource, DataStoreMixin
from stix2.datastore.filters import Filter, FilterSet, apply_common_filters from stix2.datastore.filters import Filter, FilterSet, apply_common_filters
from stix2.utils import is_marking, get_type_from_id from stix2.utils import get_type_from_id, is_marking
def _timestamp2filename(timestamp): def _timestamp2filename(timestamp):

2
stix2/test/test_datastore_filesystem.py
View File

@ -2,11 +2,11 @@ import datetime
import errno import errno
import json import json
import os import os
import pytz
import shutil import shutil
import stat import stat
import pytest import pytest
import pytz
from stix2 import (Bundle, Campaign, CustomObject, FileSystemSink, from stix2 import (Bundle, Campaign, CustomObject, FileSystemSink,
FileSystemSource, FileSystemStore, Filter, Identity, FileSystemSource, FileSystemStore, Filter, Identity,