last flake-y

master
Richard Piazza 2018-12-09 21:48:24 -05:00
parent 99276c92fc
commit a5eca9916c
4 changed files with 8 additions and 9 deletions

View File

@ -3,20 +3,20 @@ import inspect
import six import six
from stix2patterns.grammars.STIXPatternLexer import STIXPatternLexer from stix2patterns.grammars.STIXPatternLexer import STIXPatternLexer
from stix2patterns.grammars.STIXPatternParser import ( from stix2patterns.grammars.STIXPatternParser import (STIXPatternParser,
STIXPatternParser, TerminalNode, TerminalNode)
)
from stix2patterns.grammars.STIXPatternVisitor import STIXPatternVisitor from stix2patterns.grammars.STIXPatternVisitor import STIXPatternVisitor
from stix2patterns.validator import STIXPatternErrorListener from stix2patterns.validator import STIXPatternErrorListener
from stix2.patterns import _BooleanExpression
from antlr4 import CommonTokenStream, InputStream from antlr4 import CommonTokenStream, InputStream
from stix2.patterns import _BooleanExpression
# need to import all classes because we need to access them via globals() # need to import all classes because we need to access them via globals()
from .patterns import (BinaryConstant, BooleanConstant, FloatConstant,
FollowedByObservationExpression, HexConstant,
IntegerConstant, RepeatQualifier, StartStopQualifier,
StringConstant, TimestampConstant, WithinQualifier)
from .patterns import * # noqa from .patterns import * # noqa
from .patterns import (FollowedByObservationExpression, StartStopQualifier, WithinQualifier,
RepeatQualifier, StringConstant, IntegerConstant, FloatConstant, HexConstant,
BinaryConstant, BooleanConstant, TimestampConstant)
def collapse_lists(lists): def collapse_lists(lists):

View File

@ -54,7 +54,6 @@ from .utils import new_version, revoke
from .v20 import * # This import will always be the latest STIX 2.X version from .v20 import * # This import will always be the latest STIX 2.X version
from .version import __version__ from .version import __version__
_collect_stix2_obj_maps() _collect_stix2_obj_maps()
DEFAULT_VERSION = "2.0" # Default version will always be the latest STIX 2.X version DEFAULT_VERSION = "2.0" # Default version will always be the latest STIX 2.X version

View File

@ -5,6 +5,7 @@ import base64
import binascii import binascii
import datetime import datetime
import re import re
import six import six
from .utils import parse_into_datetime from .utils import parse_into_datetime

View File

@ -3,7 +3,6 @@ import datetime
import pytest import pytest
import stix2 import stix2
from stix2.STIXPatternVisitor import create_pattern_object from stix2.STIXPatternVisitor import create_pattern_object