MISP
/
cti-python-stix2
mirror of https://github.com/MISP/cti-python-stix2
2
0
Fork 0
Code Issues Releases Wiki Activity

removing debug lines; attemting to fix a Travis test error

stix2.0
= 2017-11-29 12:27:20 -05:00
parent 2399ee62ec
commit 52a052d4dd
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
stix2/sources/memory.py
View File

@ -297,7 +297,6 @@ class MemorySource(DataSource):
if stix_data["type"] == "bundle": if stix_data["type"] == "bundle":
for stix_obj in stix_data["objects"]: for stix_obj in stix_data["objects"]:
print(stix_obj)
_add(self, stix_data=parse(stix_obj, allow_custom=self.allow_custom, version=stix_data["spec_version"])) _add(self, stix_data=parse(stix_obj, allow_custom=self.allow_custom, version=stix_data["spec_version"]))
else: else:
_add(self, stix_data=parse(stix_obj, allow_custom=self.allow_custom, version=version)) _add(self, stix_data=parse(stix_obj, allow_custom=self.allow_custom, version=version))

4
stix2/test/test_versioning.py
View File

@ -223,8 +223,8 @@ def test_remove_custom_stix_property():
mal_nc = stix2.utils.remove_custom_stix(mal) mal_nc = stix2.utils.remove_custom_stix(mal)
assert "x_custom" not in mal_nc assert "x_custom" not in mal_nc
assert stix2.utils.parse_into_datetime(mal["modified"], precision="millisecond") < stix2.utils.parse_into_datetime(mal_nc["modified"], assert stix2.utils.parse_into_datetime(mal["modified"], precision="microsecond") < stix2.utils.parse_into_datetime(mal_nc["modified"],
precision="millisecond") precision="microsecond")
def test_remove_custom_stix_object(): def test_remove_custom_stix_object():

1
stix2/utils.py
View File

@ -1,5 +1,4 @@
"""Utility functions and classes for the stix2 library.""" """Utility functions and classes for the stix2 library."""
# HACK
from collections import Mapping from collections import Mapping
import copy import copy
import datetime as dt import datetime as dt