From e896812754fef30cc84b51d1f3c81e5d2de9f59e Mon Sep 17 00:00:00 2001 From: Emmanuelle Vargas-Gonzalez Date: Wed, 28 Nov 2018 16:51:35 -0500 Subject: [PATCH] minor code changes --- stix2/__init__.py | 2 +- stix2/test/v21/test_confidence.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stix2/__init__.py b/stix2/__init__.py index b876adb..beb54b0 100644 --- a/stix2/__init__.py +++ b/stix2/__init__.py @@ -29,7 +29,6 @@ # flake8: noqa from .core import _collect_stix2_mappings, parse, parse_observable -from .v20 import * # This import will always be the latest STIX 2.X version from .datastore import CompositeDataSource from .datastore.filesystem import ( FileSystemSink, FileSystemSource, @@ -68,6 +67,7 @@ from .patterns import ( WithinQualifier ) from .utils import new_version, revoke +from .v20 import * # This import will always be the latest STIX 2.X version from .version import __version__ _collect_stix2_mappings() diff --git a/stix2/test/v21/test_confidence.py b/stix2/test/v21/test_confidence.py index 4006eba..dda1670 100644 --- a/stix2/test/v21/test_confidence.py +++ b/stix2/test/v21/test_confidence.py @@ -258,7 +258,7 @@ def test_confidence_range_dni(): elif _between(39, val, 20): assert value_to_dni(val) == "Unlikely / Improbable" elif _between(59, val, 40): - assert value_to_dni(val) == "Roughly Even Change / Roughly Even Odds" + assert value_to_dni(val) == "Roughly Even Chance / Roughly Even Odds" elif _between(79, val, 60): assert value_to_dni(val) == "Likely / Probable" elif _between(89, val, 80): @@ -272,7 +272,7 @@ def test_confidence_range_dni(): ("Almost No Chance / Remote", 5), ("Very Unlikely / Highly Improbable", 15), ("Unlikely / Improbable", 30), - ("Roughly Even Change / Roughly Even Odds", 50), + ("Roughly Even Chance / Roughly Even Odds", 50), ("Likely / Probable", 70), ("Very Likely / Highly Probable", 85), ("Almost Certain / Nearly Certain", 95),