Formatting changes made by the new pre-commit hook 'add trailing commas'

closes oasis-open#189

docs/conf.py

@@ -49,7 +49,7 @@
         'navigation.html',
         'relations.html',
         'searchbox.html',
-    ]
+    ],
 }
 
 latex_elements = {}

examples/taxii_example.py

@@ -7,8 +7,10 @@
 
 
 def main():
-    collection = Collection("http://127.0.0.1:5000/trustgroup1/collections/52892447-4d7e-4f70-b94d-d7f22742ff63/",
-                            user="admin", password="Password0")
+    collection = Collection(
+        "http://127.0.0.1:5000/trustgroup1/collections/52892447-4d7e-4f70-b94d-d7f22742ff63/",
+        user="admin", password="Password0",
+    )
 
     # instantiate TAXII data source
     taxii = stix2.TAXIICollectionSource(collection)

setup.py

@@ -55,6 +55,6 @@ def get_version():
         'stix2-patterns',
     ],
     extras_require={
-        'taxii': ['taxii2-client']
-    }
+        'taxii': ['taxii2-client'],
+    },
 )

stix2/__init__.py

@@ -37,34 +37,42 @@
 from .core import _collect_stix2_mappings, parse, parse_observable
 from .v21 import *  # This import will always be the latest STIX 2.X version
 from .datastore import CompositeDataSource
-from .datastore.filesystem import (FileSystemSink, FileSystemSource,
-                                   FileSystemStore)
+from .datastore.filesystem import (
+    FileSystemSink, FileSystemSource,
+    FileSystemStore
+)
 from .datastore.filters import Filter
 from .datastore.memory import MemorySink, MemorySource, MemoryStore
-from .datastore.taxii import (TAXIICollectionSink, TAXIICollectionSource,
-                              TAXIICollectionStore)
+from .datastore.taxii import (
+    TAXIICollectionSink, TAXIICollectionSource,
+    TAXIICollectionStore
+)
 from .environment import Environment, ObjectFactory
-from .markings import (add_markings, clear_markings, get_markings, is_marked,
-                       remove_markings, set_markings)
-from .patterns import (AndBooleanExpression, AndObservationExpression,
-                       BasicObjectPathComponent, BinaryConstant,
-                       BooleanConstant, EqualityComparisonExpression,
-                       FloatConstant, FollowedByObservationExpression,
-                       GreaterThanComparisonExpression,
-                       GreaterThanEqualComparisonExpression, HashConstant,
-                       HexConstant, InComparisonExpression, IntegerConstant,
-                       IsSubsetComparisonExpression,
-                       IsSupersetComparisonExpression,
-                       LessThanComparisonExpression,
-                       LessThanEqualComparisonExpression,
-                       LikeComparisonExpression, ListConstant,
-                       ListObjectPathComponent, MatchesComparisonExpression,
-                       ObjectPath, ObservationExpression, OrBooleanExpression,
-                       OrObservationExpression, ParentheticalExpression,
-                       QualifiedObservationExpression,
-                       ReferenceObjectPathComponent, RepeatQualifier,
-                       StartStopQualifier, StringConstant, TimestampConstant,
-                       WithinQualifier)
+from .markings import (
+    add_markings, clear_markings, get_markings, is_marked,
+    remove_markings, set_markings
+)
+from .patterns import (
+    AndBooleanExpression, AndObservationExpression,
+    BasicObjectPathComponent, BinaryConstant,
+    BooleanConstant, EqualityComparisonExpression,
+    FloatConstant, FollowedByObservationExpression,
+    GreaterThanComparisonExpression,
+    GreaterThanEqualComparisonExpression, HashConstant,
+    HexConstant, InComparisonExpression, IntegerConstant,
+    IsSubsetComparisonExpression,
+    IsSupersetComparisonExpression,
+    LessThanComparisonExpression,
+    LessThanEqualComparisonExpression,
+    LikeComparisonExpression, ListConstant,
+    ListObjectPathComponent, MatchesComparisonExpression,
+    ObjectPath, ObservationExpression, OrBooleanExpression,
+    OrObservationExpression, ParentheticalExpression,
+    QualifiedObservationExpression,
+    ReferenceObjectPathComponent, RepeatQualifier,
+    StartStopQualifier, StringConstant, TimestampConstant,
+    WithinQualifier
+)
 from .utils import new_version, revoke
 from .version import __version__
 

stix2/base.py

@@ -6,11 +6,12 @@
 
 import simplejson as json
 
-from .exceptions import (AtLeastOnePropertyError, CustomContentError,
-                         DependentPropertiesError, ExtraPropertiesError,
-                         ImmutableError, InvalidObjRefError, InvalidValueError,
-                         MissingPropertiesError,
-                         MutuallyExclusivePropertiesError)
+from .exceptions import (
+    AtLeastOnePropertyError, CustomContentError, DependentPropertiesError,
+    ExtraPropertiesError, ImmutableError, InvalidObjRefError,
+    InvalidValueError, MissingPropertiesError,
+    MutuallyExclusivePropertiesError,
+)
 from .markings.utils import validate
 from .utils import NOW, find_property_index, format_datetime, get_timestamp
 from .utils import new_version as _new_version
@@ -206,8 +207,10 @@ def __str__(self):
 
     def __repr__(self):
         props = [(k, self[k]) for k in self.object_properties() if self.get(k)]
-        return '{0}({1})'.format(self.__class__.__name__,
-                                 ', '.join(['{0!s}={1!r}'.format(k, v) for k, v in props]))
+        return '{0}({1})'.format(
+            self.__class__.__name__,
+            ', '.join(['{0!s}={1!r}'.format(k, v) for k, v in props]),
+        )
 
     def __deepcopy__(self, memo):
         # Assume: we can ignore the memo argument, because no object will ever contain the same sub-object multiple times.

stix2/core.py

@@ -254,8 +254,10 @@ def _register_observable_extension(observable, new_extension, version=None):
     try:
         observable_type = observable._type
     except AttributeError:
-        raise ValueError("Unknown observable type. Custom observables must be "
-                         "created with the @CustomObservable decorator.")
+        raise ValueError(
+            "Unknown observable type. Custom observables must be "
+            "created with the @CustomObservable decorator.",
+        )
 
     OBJ_MAP_OBSERVABLE = STIX2_OBJ_MAPS[v]['observables']
     EXT_MAP = STIX2_OBJ_MAPS[v]['observable-extensions']
@@ -264,9 +266,11 @@ def _register_observable_extension(observable, new_extension, version=None):
         EXT_MAP[observable_type][new_extension._type] = new_extension
     except KeyError:
         if observable_type not in OBJ_MAP_OBSERVABLE:
-            raise ValueError("Unknown observable type '%s'. Custom observables "
-                             "must be created with the @CustomObservable decorator."
-                             % observable_type)
+            raise ValueError(
+                "Unknown observable type '%s'. Custom observables "
+                "must be created with the @CustomObservable decorator."
+                % observable_type,
+            )
         else:
             EXT_MAP[observable_type] = {new_extension._type: new_extension}
 

stix2/custom.py

@@ -2,20 +2,25 @@
 import re
 
 from .base import _Extension, _Observable, _STIXBase
-from .core import (STIXDomainObject, _register_marking, _register_object,
-                   _register_observable, _register_observable_extension)
+from .core import (
+    STIXDomainObject, _register_marking, _register_object,
+    _register_observable, _register_observable_extension,
+)
 from .utils import TYPE_REGEX, get_class_hierarchy_names
 
 
 def _custom_object_builder(cls, type, properties, version):
     class _CustomObject(cls, STIXDomainObject):
 
         if not re.match(TYPE_REGEX, type):
-            raise ValueError("Invalid type name '%s': must only contain the "
-                             "characters a-z (lowercase ASCII), 0-9, and hyphen (-)." % type)
+            raise ValueError(
+                "Invalid type name '%s': must only contain the "
+                "characters a-z (lowercase ASCII), 0-9, and hyphen (-)." % type,
+            )
         elif len(type) < 3 or len(type) > 250:
             raise ValueError(
-                "Invalid type name '%s': must be between 3 and 250 characters." % type)
+                "Invalid type name '%s': must be between 3 and 250 characters." % type,
+            )
 
         if not properties or not isinstance(properties, list):
             raise ValueError("Must supply a list, containing tuples. For example, [('property1', IntegerProperty())]")
@@ -29,8 +34,10 @@ def __init__(self, **kwargs):
                 cls.__init__(self, **kwargs)
             except (AttributeError, TypeError) as e:
                 # Don't accidentally catch errors raised in a custom __init__()
-                if ("has no attribute '__init__'" in str(e) or
-                        str(e) == "object.__init__() takes no parameters"):
+                if (
+                    "has no attribute '__init__'" in str(e) or
+                    str(e) == "object.__init__() takes no parameters"
+                ):
                     return
                 raise e
 
@@ -53,8 +60,10 @@ def __init__(self, **kwargs):
                 cls.__init__(self, **kwargs)
             except (AttributeError, TypeError) as e:
                 # Don't accidentally catch errors raised in a custom __init__()
-                if ("has no attribute '__init__'" in str(e) or
-                        str(e) == "object.__init__() takes no parameters"):
+                if (
+                    "has no attribute '__init__'" in str(e) or
+                    str(e) == "object.__init__() takes no parameters"
+                ):
                     return
                 raise e
 
@@ -66,8 +75,10 @@ def _custom_observable_builder(cls, type, properties, version):
     class _CustomObservable(cls, _Observable):
 
         if not re.match(TYPE_REGEX, type):
-            raise ValueError("Invalid observable type name '%s': must only contain the "
-                             "characters a-z (lowercase ASCII), 0-9, and hyphen (-)." % type)
+            raise ValueError(
+                "Invalid observable type name '%s': must only contain the "
+                "characters a-z (lowercase ASCII), 0-9, and hyphen (-)." % type,
+            )
         elif len(type) < 3 or len(type) > 250:
             raise ValueError("Invalid observable type name '%s': must be between 3 and 250 characters." % type)
 
@@ -77,12 +88,16 @@ class _CustomObservable(cls, _Observable):
         # Check properties ending in "_ref/s" are ObjectReferenceProperties
         for prop_name, prop in properties:
             if prop_name.endswith('_ref') and ('ObjectReferenceProperty' not in get_class_hierarchy_names(prop)):
-                raise ValueError("'%s' is named like an object reference property but "
-                                 "is not an ObjectReferenceProperty." % prop_name)
+                raise ValueError(
+                    "'%s' is named like an object reference property but "
+                    "is not an ObjectReferenceProperty." % prop_name,
+                )
             elif (prop_name.endswith('_refs') and ('ListProperty' not in get_class_hierarchy_names(prop)
                                                    or 'ObjectReferenceProperty' not in get_class_hierarchy_names(prop.contained))):
-                raise ValueError("'%s' is named like an object reference list property but "
-                                 "is not a ListProperty containing ObjectReferenceProperty." % prop_name)
+                raise ValueError(
+                    "'%s' is named like an object reference list property but "
+                    "is not a ListProperty containing ObjectReferenceProperty." % prop_name,
+                )
 
         _type = type
         _properties = OrderedDict(properties)
@@ -93,8 +108,10 @@ def __init__(self, **kwargs):
                 cls.__init__(self, **kwargs)
             except (AttributeError, TypeError) as e:
                 # Don't accidentally catch errors raised in a custom __init__()
-                if ("has no attribute '__init__'" in str(e) or
-                        str(e) == "object.__init__() takes no parameters"):
+                if (
+                    "has no attribute '__init__'" in str(e) or
+                    str(e) == "object.__init__() takes no parameters"
+                ):
                     return
                 raise e
 
@@ -109,8 +126,10 @@ def _custom_extension_builder(cls, observable, type, properties, version):
     class _CustomExtension(cls, _Extension):
 
         if not re.match(TYPE_REGEX, type):
-            raise ValueError("Invalid extension type name '%s': must only contain the "
-                             "characters a-z (lowercase ASCII), 0-9, and hyphen (-)." % type)
+            raise ValueError(
+                "Invalid extension type name '%s': must only contain the "
+                "characters a-z (lowercase ASCII), 0-9, and hyphen (-)." % type,
+            )
         elif len(type) < 3 or len(type) > 250:
             raise ValueError("Invalid extension type name '%s': must be between 3 and 250 characters." % type)
 
@@ -126,8 +145,10 @@ def __init__(self, **kwargs):
                 cls.__init__(self, **kwargs)
             except (AttributeError, TypeError) as e:
                 # Don't accidentally catch errors raised in a custom __init__()
-                if ("has no attribute '__init__'" in str(e) or
-                        str(e) == "object.__init__() takes no parameters"):
+                if (
+                    "has no attribute '__init__'" in str(e) or
+                    str(e) == "object.__init__() takes no parameters"
+                ):
                     return
                 raise e
 

stix2/datastore/filesystem.py

@@ -41,7 +41,7 @@ def __init__(self, stix_dir, allow_custom=None, bundlify=False):
 
         super(FileSystemStore, self).__init__(
             source=FileSystemSource(stix_dir=stix_dir, allow_custom=allow_custom_source),
-            sink=FileSystemSink(stix_dir=stix_dir, allow_custom=allow_custom_sink, bundlify=bundlify)
+            sink=FileSystemSink(stix_dir=stix_dir, allow_custom=allow_custom_sink, bundlify=bundlify),
         )
 
 
@@ -134,9 +134,11 @@ def add(self, stix_data=None):
                 self.add(stix_obj)
 
         else:
-            raise TypeError("stix_data must be a STIX object (or list of), "
-                            "JSON formatted STIX (or list of), "
-                            "or a JSON formatted STIX bundle")
+            raise TypeError(
+                "stix_data must be a STIX object (or list of), "
+                "JSON formatted STIX (or list of), "
+                "or a JSON formatted STIX bundle",
+            )
 
 
 class FileSystemSource(DataSource):

stix2/datastore/memory.py

@@ -81,7 +81,7 @@ def __init__(self, stix_data=None, allow_custom=True):
 
         super(MemoryStore, self).__init__(
             source=MemorySource(stix_data=self._data, allow_custom=allow_custom, _store=True),
-            sink=MemorySink(stix_data=self._data, allow_custom=allow_custom, _store=True)
+            sink=MemorySink(stix_data=self._data, allow_custom=allow_custom, _store=True),
         )
 
     def save_to_file(self, *args, **kwargs):