From b3f69bf942256c8d890440f67f0e3ab3312781b0 Mon Sep 17 00:00:00 2001 From: Richard Piazza Date: Mon, 10 Dec 2018 13:42:05 -0500 Subject: [PATCH] imports again --- stix2/STIXPatternVisitor.py | 9 +++++++-- stix2/test/test_pattern_expressions.py | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/stix2/STIXPatternVisitor.py b/stix2/STIXPatternVisitor.py index c7c5a3e..6c6690f 100644 --- a/stix2/STIXPatternVisitor.py +++ b/stix2/STIXPatternVisitor.py @@ -9,9 +9,14 @@ from stix2patterns.grammars.STIXPatternVisitor import STIXPatternVisitor from stix2patterns.validator import STIXPatternErrorListener from antlr4 import CommonTokenStream, InputStream -from stix2.patterns import _BooleanExpression +from stix2.patterns import (BinaryConstant, BooleanConstant, FloatConstant, + FollowedByObservationExpression, HexConstant, + IntegerConstant, RepeatQualifier, + StartStopQualifier, StringConstant, + TimestampConstant, WithinQualifier) +from stix2.patterns import _BooleanExpression # noqa -from .patterns import * # noqa: F405 +from .patterns import * # noqa: F403, F401 def collapse_lists(lists): diff --git a/stix2/test/test_pattern_expressions.py b/stix2/test/test_pattern_expressions.py index 2d59cde..62dc242 100644 --- a/stix2/test/test_pattern_expressions.py +++ b/stix2/test/test_pattern_expressions.py @@ -520,4 +520,4 @@ def test_parsing_qualified_expression(): def test_list_constant(): patt_obj = create_pattern_object("[network-traffic:src_ref.value IN ('10.0.0.0', '10.0.0.1', '10.0.0.2')]") - assert str(patt_obj) == "[network-traffic:src_ref.value IN ('10.0.0.0', '10.0.0.1', '10.0.0.2')]" \ No newline at end of file + assert str(patt_obj) == "[network-traffic:src_ref.value IN ('10.0.0.0', '10.0.0.1', '10.0.0.2')]"