diff --git a/stix2/base.py b/stix2/base.py index 2374bf5..8be31d7 100644 --- a/stix2/base.py +++ b/stix2/base.py @@ -17,7 +17,7 @@ from .exceptions import ( ) from .markings import _MarkingsMixin from .markings.utils import validate -from .serialize import ( +from .serialization import ( STIXJSONEncoder, STIXJSONIncludeOptionalDefaultsEncoder, serialize, ) from .utils import NOW, PREFIX_21_REGEX, get_timestamp diff --git a/stix2/datastore/filesystem.py b/stix2/datastore/filesystem.py index c0ef773..d865768 100644 --- a/stix2/datastore/filesystem.py +++ b/stix2/datastore/filesystem.py @@ -9,12 +9,13 @@ import stat import six from stix2 import v20, v21 -from stix2.base import _STIXBase, serialize +from stix2.base import _STIXBase from stix2.datastore import ( DataSink, DataSource, DataSourceError, DataStoreMixin, ) from stix2.datastore.filters import Filter, FilterSet, apply_common_filters from stix2.parsing import parse +from stix2.serialization import serialize from stix2.utils import format_datetime, get_type_from_id, parse_into_datetime diff --git a/stix2/serialize.py b/stix2/serialization.py similarity index 100% rename from stix2/serialize.py rename to stix2/serialization.py