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

Make Travis happy with cosmetic fixes

stix2.1
clenk 2017-06-01 16:47:56 -04:00
parent 9dbde93031
commit f321447ecc
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
stix2/base.py
View File

@ -5,9 +5,12 @@ import copy
import datetime as dt import datetime as dt
import json import json
from .exceptions import (AtLeastOnePropertyError, DependentPropertiesError, ExtraPropertiesError, ImmutableError, from .exceptions import (AtLeastOnePropertyError, DependentPropertiesError,
InvalidObjRefError, InvalidValueError, MissingPropertiesError, MutuallyExclusivePropertiesError, ExtraPropertiesError, ImmutableError,
RevokeError, UnmodifiablePropertyError) InvalidObjRefError, InvalidValueError,
MissingPropertiesError,
MutuallyExclusivePropertiesError, RevokeError,
UnmodifiablePropertyError)
from .utils import NOW, format_datetime, get_timestamp, parse_into_datetime from .utils import NOW, format_datetime, get_timestamp, parse_into_datetime
__all__ = ['STIXJSONEncoder', '_STIXBase'] __all__ = ['STIXJSONEncoder', '_STIXBase']

2
stix2/sources/taxii.py
View File

@ -206,7 +206,7 @@ class TAXIIDataSource(DataSource):
all_data.append(stix_obj) all_data.append(stix_obj)
except requests.exceptions.RequestException as e: except requests.exceptions.RequestException as e:
raise raise e
# raise type(e), type(e)(e.message + # raise type(e), type(e)(e.message +
# "Attempting to connect to %s" % coll_url) # "Attempting to connect to %s" % coll_url)