Fix import sort order

pull/1/head
Chris Lenk 2021-01-15 10:27:39 -05:00
parent a3f20dde7a
commit 7de5c458bb
4 changed files with 4 additions and 6 deletions

View File

@ -24,8 +24,6 @@
# flake8: noqa # flake8: noqa
from .version import DEFAULT_VERSION
from .confidence import scales from .confidence import scales
from .datastore import CompositeDataSource from .datastore import CompositeDataSource
from .datastore.filesystem import ( from .datastore.filesystem import (
@ -57,9 +55,9 @@ from .patterns import (
RepeatQualifier, StartStopQualifier, StringConstant, TimestampConstant, RepeatQualifier, StartStopQualifier, StringConstant, TimestampConstant,
WithinQualifier, WithinQualifier,
) )
from .registry import _collect_stix2_mappings
from .v21 import * # This import will always be the latest STIX 2.X version from .v21 import * # This import will always be the latest STIX 2.X version
from .version import __version__ from .version import DEFAULT_VERSION, __version__
from .versioning import new_version, revoke from .versioning import new_version, revoke
from .registry import _collect_stix2_mappings
_collect_stix2_mappings() _collect_stix2_mappings()

View File

@ -2,6 +2,7 @@ import re
import stix2 import stix2
import stix2.registry import stix2.registry
from .base import _DomainObject, _Observable from .base import _DomainObject, _Observable
from .exceptions import DuplicateRegistrationError from .exceptions import DuplicateRegistrationError
from .utils import PREFIX_21_REGEX, get_class_hierarchy_names from .utils import PREFIX_21_REGEX, get_class_hierarchy_names

View File

@ -2,7 +2,6 @@ import importlib
import pkgutil import pkgutil
import re import re
# Collects information on which classes implement which STIX types, for the # Collects information on which classes implement which STIX types, for the
# various STIX spec versions. # various STIX spec versions.
STIX2_OBJ_MAPS = {} STIX2_OBJ_MAPS = {}

View File

@ -2,8 +2,8 @@ import pytest
import stix2 import stix2
import stix2.parsing import stix2.parsing
import stix2.registry
import stix2.registration import stix2.registration
import stix2.registry
import stix2.v20 import stix2.v20
from ...exceptions import DuplicateRegistrationError, InvalidValueError from ...exceptions import DuplicateRegistrationError, InvalidValueError