From 8d378fcf81974653366b571ca537b3f975e0eb6b Mon Sep 17 00:00:00 2001 From: Emmanuelle Vargas-Gonzalez Date: Tue, 10 Jul 2018 15:27:05 -0400 Subject: [PATCH] Remove STIXRelationshipObject from 'sro.py' --- stix2/v20/sro.py | 13 ++++--------- stix2/v21/sro.py | 13 ++++--------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/stix2/v20/sro.py b/stix2/v20/sro.py index 5557127..ffe81d3 100644 --- a/stix2/v20/sro.py +++ b/stix2/v20/sro.py @@ -2,17 +2,12 @@ from collections import OrderedDict -from ..base import _STIXBase -from ..markings import _MarkingsMixin +from ..core import STIXRelationshipObject +from ..properties import (BooleanProperty, IDProperty, IntegerProperty, + ListProperty, ReferenceProperty, StringProperty, + TimestampProperty, TypeProperty) from ..utils import NOW from .common import ExternalReference, GranularMarking -from .properties import (BooleanProperty, IDProperty, IntegerProperty, - ListProperty, ReferenceProperty, StringProperty, - TimestampProperty, TypeProperty) - - -class STIXRelationshipObject(_STIXBase, _MarkingsMixin): - pass class Relationship(STIXRelationshipObject): diff --git a/stix2/v21/sro.py b/stix2/v21/sro.py index 6deada3..266a222 100644 --- a/stix2/v21/sro.py +++ b/stix2/v21/sro.py @@ -2,17 +2,12 @@ from collections import OrderedDict -from ..base import _STIXBase -from ..markings import _MarkingsMixin +from ..core import STIXRelationshipObject +from ..properties import (BooleanProperty, IDProperty, IntegerProperty, + ListProperty, ReferenceProperty, StringProperty, + TimestampProperty, TypeProperty) from ..utils import NOW from .common import ExternalReference, GranularMarking -from .properties import (BooleanProperty, IDProperty, IntegerProperty, - ListProperty, ReferenceProperty, StringProperty, - TimestampProperty, TypeProperty) - - -class STIXRelationshipObject(_STIXBase, _MarkingsMixin): - pass class Relationship(STIXRelationshipObject):