X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Fstream_class.py;h=885ba746dae01ae37b9db9ae5a0873453fe58804;hb=f5567ea88d172767b34373bc6e402da8bfd85ef8;hp=4468d5d5696150597dfe91982b154dab259677e0;hpb=3321d9b00a7554e189aed2377c2b9caa0f201800;p=babeltrace.git

diff --git a/src/bindings/python/bt2/bt2/stream_class.py b/src/bindings/python/bt2/bt2/stream_class.py
index 4468d5d5..885ba746 100644
--- a/src/bindings/python/bt2/bt2/stream_class.py
+++ b/src/bindings/python/bt2/bt2/stream_class.py
@@ -1,24 +1,6 @@
-# The MIT License (MIT)
+# SPDX-License-Identifier: MIT
 #
 # Copyright (c) 2017 Philippe Proulx <pproulx@efficios.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
 
 from bt2 import native_bt, object, utils
 from bt2 import field_class as bt2_field_class
@@ -232,14 +214,14 @@ class _StreamClass(_StreamClassConst):
         if self.assigns_automatic_event_class_id:
             if id is not None:
                 raise ValueError(
-                    'id provided, but stream class assigns automatic event class ids'
+                    "id provided, but stream class assigns automatic event class ids"
                 )
 
             ec_ptr = native_bt.event_class_create(self._ptr)
         else:
             if id is None:
                 raise ValueError(
-                    'id not provided, but stream class does not assign automatic event class ids'
+                    "id not provided, but stream class does not assign automatic event class ids"
                 )
 
             utils._check_uint64(id)
@@ -363,7 +345,7 @@ class _StreamClass(_StreamClassConst):
         if packet_context_field_class is not None:
             if not supports_packets:
                 raise ValueError(
-                    'cannot have a packet context field class without supporting packets'
+                    "cannot have a packet context field class without supporting packets"
                 )
 
             utils._check_type(
@@ -394,24 +376,27 @@ class _StreamClass(_StreamClassConst):
         if not supports_packets:
             if packets_have_beginning_default_clock_snapshot:
                 raise ValueError(
-                    'cannot not support packets, but have packet beginning default clock snapshot'
+                    "cannot not support packets, but have packet beginning default clock snapshot"
                 )
             if packets_have_end_default_clock_snapshot:
                 raise ValueError(
-                    'cannot not support packets, but have packet end default clock snapshots'
+                    "cannot not support packets, but have packet end default clock snapshots"
                 )
 
         # Discarded events
         utils._check_bool(supports_discarded_events)
         utils._check_bool(discarded_events_have_default_clock_snapshots)
 
-        if (
-            not supports_discarded_events
-            and discarded_events_have_default_clock_snapshots
-        ):
-            raise ValueError(
-                'cannot not support discarded events, but have default clock snapshots for discarded event messages'
-            )
+        if discarded_events_have_default_clock_snapshots:
+            if not supports_discarded_events:
+                raise ValueError(
+                    "cannot not support discarded events, but have default clock snapshots for discarded event messages"
+                )
+
+            if default_clock_class is None:
+                raise ValueError(
+                    "cannot have no default clock class, but have default clock snapshots for discarded event messages"
+                )
 
         # Discarded packets
         utils._check_bool(supports_discarded_packets)
@@ -419,13 +404,16 @@ class _StreamClass(_StreamClassConst):
 
         if supports_discarded_packets and not supports_packets:
             raise ValueError(
-                'cannot support discarded packets, but not support packets'
+                "cannot support discarded packets, but not support packets"
             )
 
-        if (
-            not supports_discarded_packets
-            and discarded_packets_have_default_clock_snapshots
-        ):
-            raise ValueError(
-                'cannot not support discarded packets, but have default clock snapshots for discarded packet messages'
-            )
+        if discarded_packets_have_default_clock_snapshots:
+            if not supports_discarded_packets:
+                raise ValueError(
+                    "cannot not support discarded packets, but have default clock snapshots for discarded packet messages"
+                )
+
+            if default_clock_class is None:
+                raise ValueError(
+                    "cannot have no default clock class, but have default clock snapshots for discarded packet messages"
+                )