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

Fix merge conflicts

stix2.1
Chris Lenk 2017-10-06 14:19:09 -04:00
parent 9ea4344ca7
commit 66e57ced25
4 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
stix2/sources/filesystem.py
View File

@ -1,11 +1,6 @@
""" """
Python STIX 2.0 FileSystem Source/Sink Python STIX 2.0 FileSystem Source/Sink
Classes:
FileSystemStore
FileSystemSink
FileSystemSource
TODO: TODO:
Test everything Test everything
""" """
@ -160,8 +155,9 @@ class FileSystemSource(DataSource):
all_data = self.query(query=query, _composite_filters=_composite_filters) all_data = self.query(query=query, _composite_filters=_composite_filters)
if len(all_data): if all_data:
stix_obj = parse(sorted(all_data, key=lambda k: k['modified'])[0]) stix_obj = sorted(all_data, key=lambda k: k['modified'])[0]
stix_obj = parse(stix_obj)
else: else:
stix_obj = None stix_obj = None

3
stix2/sources/filters.py
View File

@ -1,9 +1,6 @@
""" """
Filters for Python STIX 2.0 DataSources, DataSinks, DataStores Filters for Python STIX 2.0 DataSources, DataSinks, DataStores
Classes:
Filter
""" """
import collections import collections

5
stix2/sources/memory.py
View File

@ -1,11 +1,6 @@
""" """
Python STIX 2.0 Memory Source/Sink Python STIX 2.0 Memory Source/Sink
Classes:
MemoryStore
MemorySink
MemorySource
TODO: TODO:
Run through tests again, lot of changes. Run through tests again, lot of changes.

5
stix2/sources/taxii.py
View File

@ -1,11 +1,6 @@
""" """
Python STIX 2.0 TAXII Source/Sink Python STIX 2.0 TAXII Source/Sink
Classes:
TAXIICollectionStore
TAXIICollectionSink
TAXIICollectionSource
TODO: TODO:
Test everything Test everything