From fa6978969bd63d93e2b2b51c60d720a46e630e49 Mon Sep 17 00:00:00 2001 From: Emmanuelle Vargas-Gonzalez Date: Thu, 18 Feb 2021 10:20:42 -0500 Subject: [PATCH] removing unused imports (backwards breaking) --- stix2/environment.py | 11 +---------- stix2/test/v21/test_environment.py | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 25 deletions(-) diff --git a/stix2/environment.py b/stix2/environment.py index cebb080..d0f694e 100644 --- a/stix2/environment.py +++ b/stix2/environment.py @@ -3,18 +3,9 @@ import copy from .datastore import CompositeDataSource, DataStoreMixin from .equivalence.graph import graph_equivalence, graph_similarity -from .equivalence.object import ( # noqa: F401 - WEIGHTS, check_property_present, custom_pattern_based, exact_match, - list_reference_check, object_equivalence, object_similarity, - partial_external_reference_based, partial_list_based, - partial_location_distance, partial_string_based, partial_timestamp_based, - reference_check, -) +from .equivalence.object import object_equivalence, object_similarity from .parsing import parse as _parse -# TODO: Remove all unused imports that now belong to the equivalence module in the next major release. -# Kept for backwards compatibility. - class ObjectFactory(object): """Easily create STIX objects with default values for certain properties. diff --git a/stix2/test/v21/test_environment.py b/stix2/test/v21/test_environment.py index c3c2701..e7bf4da 100644 --- a/stix2/test/v21/test_environment.py +++ b/stix2/test/v21/test_environment.py @@ -670,17 +670,17 @@ def test_object_similarity_on_unknown_object(): def _x_foobar_checks(obj1, obj2, **weights): matching_score = 0.0 sum_weights = 0.0 - if stix2.environment.check_property_present("external_references", obj1, obj2): + if stix2.equivalence.object.check_property_present("external_references", obj1, obj2): w = weights["external_references"] sum_weights += w - matching_score += w * stix2.environment.partial_external_reference_based( + matching_score += w * stix2.equivalence.object.partial_external_reference_based( obj1["external_references"], obj2["external_references"], ) - if stix2.environment.check_property_present("name", obj1, obj2): + if stix2.equivalence.object.check_property_present("name", obj1, obj2): w = weights["name"] sum_weights += w - matching_score += w * stix2.environment.partial_string_based(obj1["name"], obj2["name"]) + matching_score += w * stix2.equivalence.object.partial_string_based(obj1["name"], obj2["name"]) return matching_score, sum_weights weights = { @@ -731,9 +731,9 @@ def test_object_similarity_zero_match(): ) weights = { "indicator": { - "indicator_types": (15, stix2.environment.partial_list_based), - "pattern": (80, stix2.environment.custom_pattern_based), - "valid_from": (5, stix2.environment.partial_timestamp_based), + "indicator_types": (15, stix2.equivalence.object.partial_list_based), + "pattern": (80, stix2.equivalence.object.custom_pattern_based), + "valid_from": (5, stix2.equivalence.object.partial_timestamp_based), "tdelta": 1, # One day interval }, "_internal": { @@ -755,9 +755,9 @@ def test_object_similarity_different_spec_version(): ) weights = { "indicator": { - "indicator_types": (15, stix2.environment.partial_list_based), - "pattern": (80, stix2.environment.custom_pattern_based), - "valid_from": (5, stix2.environment.partial_timestamp_based), + "indicator_types": (15, stix2.equivalence.object.partial_list_based), + "pattern": (80, stix2.equivalence.object.custom_pattern_based), + "valid_from": (5, stix2.equivalence.object.partial_timestamp_based), "tdelta": 1, # One day interval }, "_internal": { @@ -842,20 +842,20 @@ def test_object_similarity_different_spec_version(): ], ) def test_object_similarity_external_references(refs1, refs2, ret_val): - value = stix2.environment.partial_external_reference_based(refs1, refs2) + value = stix2.equivalence.object.partial_external_reference_based(refs1, refs2) assert value == ret_val def test_object_similarity_timestamp(): t1 = "2018-10-17T00:14:20.652Z" t2 = "2018-10-17T12:14:20.652Z" - assert stix2.environment.partial_timestamp_based(t1, t2, 1) == 0.5 + assert stix2.equivalence.object.partial_timestamp_based(t1, t2, 1) == 0.5 def test_object_similarity_exact_match(): t1 = "2018-10-17T00:14:20.652Z" t2 = "2018-10-17T12:14:20.652Z" - assert stix2.environment.exact_match(t1, t2) == 0.0 + assert stix2.equivalence.object.exact_match(t1, t2) == 0.0 def test_non_existent_config_for_object(): @@ -877,8 +877,8 @@ def test_object_similarity_method_provided(): weights = { "tool": { - "tool_types": (20, stix2.environment.partial_list_based), - "name": (80, stix2.environment.partial_string_based), + "tool_types": (20, stix2.equivalence.object.partial_list_based), + "name": (80, stix2.equivalence.object.partial_string_based), "method": custom_semantic_equivalence_method, }, }