From f321447ecccd12528fe4e6d4679f0b0296c42fc0 Mon Sep 17 00:00:00 2001 From: clenk Date: Thu, 1 Jun 2017 16:47:56 -0400 Subject: [PATCH] Make Travis happy with cosmetic fixes --- stix2/base.py | 9 ++++++--- stix2/sources/taxii.py | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/stix2/base.py b/stix2/base.py index 7d2bf24..cde8bb6 100644 --- a/stix2/base.py +++ b/stix2/base.py @@ -5,9 +5,12 @@ import copy import datetime as dt import json -from .exceptions import (AtLeastOnePropertyError, DependentPropertiesError, ExtraPropertiesError, ImmutableError, - InvalidObjRefError, InvalidValueError, MissingPropertiesError, MutuallyExclusivePropertiesError, - RevokeError, UnmodifiablePropertyError) +from .exceptions import (AtLeastOnePropertyError, DependentPropertiesError, + ExtraPropertiesError, ImmutableError, + InvalidObjRefError, InvalidValueError, + MissingPropertiesError, + MutuallyExclusivePropertiesError, RevokeError, + UnmodifiablePropertyError) from .utils import NOW, format_datetime, get_timestamp, parse_into_datetime __all__ = ['STIXJSONEncoder', '_STIXBase'] diff --git a/stix2/sources/taxii.py b/stix2/sources/taxii.py index 09c1b9d..c83d220 100644 --- a/stix2/sources/taxii.py +++ b/stix2/sources/taxii.py @@ -206,7 +206,7 @@ class TAXIIDataSource(DataSource): all_data.append(stix_obj) except requests.exceptions.RequestException as e: - raise + raise e # raise type(e), type(e)(e.message + # "Attempting to connect to %s" % coll_url)