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

split properties out by spec version

stix2.1
Trey Darley 2018-06-26 09:32:24 +00:00
parent d44c2abd0f
commit 5cbe886cdb
12 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stix2/v20/bundle.py
View File

@ -2,7 +2,7 @@ from collections import OrderedDict
from stix2 import parse
from stix2.base import _STIXBase
from stix2.properties import (IDProperty, ListProperty, Property,
from .properties import (IDProperty, ListProperty, Property,
StringProperty, TypeProperty)
from stix2.utils import _get_dict, get_class_hierarchy_names

2
stix2/v20/common.py
View File

@ -4,7 +4,7 @@ from collections import OrderedDict
from ..base import _STIXBase
from ..markings import _MarkingsMixin
from ..properties import (HashesProperty, IDProperty, ListProperty, Property,
from .properties import (HashesProperty, IDProperty, ListProperty, Property,
ReferenceProperty, SelectorProperty, StringProperty,
TimestampProperty, TypeProperty)
from ..utils import NOW, _get_dict

2
stix2/v20/observables.py
View File

@ -12,7 +12,7 @@ import re
from ..base import _Extension, _Observable, _STIXBase
from ..exceptions import (AtLeastOnePropertyError, CustomContentError,
DependentPropertiesError, ParseError)
from ..properties import (BinaryProperty, BooleanProperty, DictionaryProperty,
from .properties import (BinaryProperty, BooleanProperty, DictionaryProperty,
EmbeddedObjectProperty, EnumProperty, FloatProperty,
HashesProperty, HexProperty, IntegerProperty,
ListProperty, ObjectReferenceProperty, Property,

6
stix2/v20/properties.py
View File

@ -10,9 +10,9 @@ import uuid
from six import string_types, text_type
from stix2patterns.validator import run_validator
from .base import _STIXBase
from .exceptions import DictionaryKeyError
from .utils import _get_dict, parse_into_datetime
from stix2.base import _STIXBase
from stix2.exceptions import DictionaryKeyError
from stix2.utils import _get_dict, parse_into_datetime
class Property(object):

2
stix2/v20/sdo.py
View File

@ -8,7 +8,7 @@ import stix2
from ..base import _STIXBase
from ..markings import _MarkingsMixin
from ..properties import (BooleanProperty, IDProperty, IntegerProperty,
from .properties import (BooleanProperty, IDProperty, IntegerProperty,
ListProperty, PatternProperty, ReferenceProperty,
StringProperty, TimestampProperty, TypeProperty)
from ..utils import NOW, TYPE_REGEX

2
stix2/v20/sro.py
View File

@ -4,7 +4,7 @@ from collections import OrderedDict
from ..base import _STIXBase
from ..markings import _MarkingsMixin
from ..properties import (BooleanProperty, IDProperty, IntegerProperty,
from .properties import (BooleanProperty, IDProperty, IntegerProperty,
ListProperty, ReferenceProperty, StringProperty,
TimestampProperty, TypeProperty)
from ..utils import NOW

2
stix2/v21/bundle.py
View File

@ -2,7 +2,7 @@ from collections import OrderedDict
from stix2 import parse
from stix2.base import _STIXBase
from stix2.properties import IDProperty, ListProperty, Property, TypeProperty
from .properties import IDProperty, ListProperty, Property, TypeProperty
from stix2.utils import _get_dict, get_class_hierarchy_names

2
stix2/v21/common.py
View File

@ -4,7 +4,7 @@ from collections import OrderedDict
from ..base import _STIXBase
from ..markings import _MarkingsMixin
from ..properties import (BooleanProperty, DictionaryProperty, HashesProperty,
from .properties import (BooleanProperty, DictionaryProperty, HashesProperty,
IDProperty, ListProperty, Property,
ReferenceProperty, SelectorProperty, StringProperty,
TimestampProperty, TypeProperty)

2
stix2/v21/observables.py
View File

@ -12,7 +12,7 @@ import re
from ..base import _Extension, _Observable, _STIXBase
from ..exceptions import (AtLeastOnePropertyError, CustomContentError,
DependentPropertiesError, ParseError)
from ..properties import (BinaryProperty, BooleanProperty, DictionaryProperty,
from .properties import (BinaryProperty, BooleanProperty, DictionaryProperty,
EmbeddedObjectProperty, EnumProperty, FloatProperty,
HashesProperty, HexProperty, IntegerProperty,
ListProperty, ObjectReferenceProperty, Property,

6
stix2/v21/properties.py
View File

@ -10,9 +10,9 @@ import uuid
from six import string_types, text_type
from stix2patterns.validator import run_validator
from .base import _STIXBase
from .exceptions import DictionaryKeyError
from .utils import _get_dict, parse_into_datetime
from stix2.base import _STIXBase
from stix2.exceptions import DictionaryKeyError
from stix2.utils import _get_dict, parse_into_datetime
class Property(object):

2
stix2/v21/sdo.py
View File

@ -7,7 +7,7 @@ import stix2
from ..base import _STIXBase
from ..markings import _MarkingsMixin
from ..properties import (BooleanProperty, DictionaryProperty,
from .properties import (BooleanProperty, DictionaryProperty,
EmbeddedObjectProperty, EnumProperty, FloatProperty,
IDProperty, IntegerProperty, ListProperty,
PatternProperty, ReferenceProperty, StringProperty,

2
stix2/v21/sro.py
View File

@ -4,7 +4,7 @@ from collections import OrderedDict
from ..base import _STIXBase
from ..markings import _MarkingsMixin
from ..properties import (BooleanProperty, IDProperty, IntegerProperty,
from .properties import (BooleanProperty, IDProperty, IntegerProperty,
ListProperty, ReferenceProperty, StringProperty,
TimestampProperty, TypeProperty)
from ..utils import NOW