still WIP

stix2/datastore/filters.py

@@ -245,8 +245,13 @@ class FilterSet(object):
         """ """
         return len(self._filters)
 
-    def add(self, filters):
+    def add(self, filters=None):
         """ """
+        if not filters:
+            # so add() can be called blindly, useful for
+            # DataStore/Environment usage of filter operations
+            return
+
         if not isinstance(filters, FilterSet) and not isinstance(filters, list):
             filters = [filters]
 
@@ -256,8 +261,13 @@ class FilterSet(object):
 
         return
 
-    def remove(self, filters):
+    def remove(self, filters=None):
         """ """
+        if not filters:
+            # so remove() can be called blindly, useful for
+            # DataStore/Environemnt usage of filter ops
+            return
+
         if not isinstance(filters, FilterSet) and not isinstance(filters, list):
             filters = [filters]
 

stix2/environment.py

@@ -158,7 +158,7 @@ class Environment(DataStoreMixin):
     set_default_object_marking_refs.__doc__ = ObjectFactory.set_default_object_marking_refs.__doc__
 
     def add_filters(self, *args, **kwargs):
-        return self.source.filters.update(*args, **kwargs)
+        return self.source.filters.add(*args, **kwargs)
 
     def add_filter(self, *args, **kwargs):
         return self.source.filters.add(*args, **kwargs)

stix2/test/test_datastore.py

@@ -461,7 +461,6 @@ def test_apply_common_filters():
     # BUG: This test is brokem , weird behavior, the file obj
     # in stix_objs is being parsed into real python-stix2 obj even though
     # it never goes through parse() --> BAD <_<
-    print(stix_objs)
     resp = list(apply_common_filters(stix_objs, [filters[14]]))
     assert resp[0]["id"] == stix_objs[14]["id"]
     assert len(resp) == 1