Fix typos

[babeltrace.git] / src / bindings / python / bt2 / bt2 / message_iterator.py

diff --git a/src/bindings/python/bt2/bt2/message_iterator.py b/src/bindings/python/bt2/bt2/message_iterator.py
index f0a47ec72818dcce89071e8ec2ae203e0844d96f..8703e90be10f095c8a5f0cb96d9deade24ebe488 100644 (file)
--- a/src/bindings/python/bt2/bt2/message_iterator.py
+++ b/src/bindings/python/bt2/bt2/message_iterator.py
@@ -2,17 +2,18 @@
 #
 # Copyright (c) 2017 Philippe Proulx <pproulx@efficios.com>
 
-from bt2 import native_bt
-from bt2 import object as bt2_object
-from bt2 import utils as bt2_utils
-from bt2 import message as bt2_message
 import collections.abc
-from bt2 import stream as bt2_stream
-from bt2 import event_class as bt2_event_class
-from bt2 import packet as bt2_packet
+
 from bt2 import port as bt2_port
+from bt2 import error as bt2_error
+from bt2 import utils as bt2_utils
+from bt2 import object as bt2_object
+from bt2 import packet as bt2_packet
+from bt2 import stream as bt2_stream
+from bt2 import message as bt2_message
+from bt2 import native_bt
 from bt2 import clock_class as bt2_clock_class
-import bt2
+from bt2 import event_class as bt2_event_class
 
 
 class _MessageIterator(collections.abc.Iterator):
@@ -167,14 +168,14 @@ class _UserMessageIterator(_MessageIterator):
         pass
 
     def __next__(self):
-        raise bt2.Stop
+        raise bt2_utils.Stop
 
     def _bt_next_from_native(self):
-        # this can raise anything: it's catched by the native part
+        # this can raise anything: it's caught by the native part
         try:
             msg = next(self)
         except StopIteration:
-            raise bt2.Stop
+            raise bt2_utils.Stop
         except Exception:
             raise
 
@@ -280,7 +281,7 @@ class _UserMessageIterator(_MessageIterator):
                 )
 
         if ptr is None:
-            raise bt2._MemoryError("cannot create event message object")
+            raise bt2_error._MemoryError("cannot create event message object")
 
         return bt2_message._EventMessage(ptr)
 
@@ -291,7 +292,7 @@ class _UserMessageIterator(_MessageIterator):
         )
 
         if ptr is None:
-            raise bt2._MemoryError("cannot create inactivity message object")
+            raise bt2_error._MemoryError("cannot create inactivity message object")
 
         return bt2_message._MessageIteratorInactivityMessage(ptr)
 
@@ -300,7 +301,9 @@ class _UserMessageIterator(_MessageIterator):
 
         ptr = native_bt.message_stream_beginning_create(self._bt_ptr, stream._ptr)
         if ptr is None:
-            raise bt2._MemoryError("cannot create stream beginning message object")
+            raise bt2_error._MemoryError(
+                "cannot create stream beginning message object"
+            )
 
         msg = bt2_message._StreamBeginningMessage(ptr)
 
@@ -314,7 +317,7 @@ class _UserMessageIterator(_MessageIterator):
 
         ptr = native_bt.message_stream_end_create(self._bt_ptr, stream._ptr)
         if ptr is None:
-            raise bt2._MemoryError("cannot create stream end message object")
+            raise bt2_error._MemoryError("cannot create stream end message object")
 
         msg = bt2_message._StreamEndMessage(ptr)
 
@@ -345,7 +348,9 @@ class _UserMessageIterator(_MessageIterator):
             ptr = native_bt.message_packet_beginning_create(self._bt_ptr, packet._ptr)
 
         if ptr is None:
-            raise bt2._MemoryError("cannot create packet beginning message object")
+            raise bt2_error._MemoryError(
+                "cannot create packet beginning message object"
+            )
 
         return bt2_message._PacketBeginningMessage(ptr)
 
@@ -371,7 +376,7 @@ class _UserMessageIterator(_MessageIterator):
             ptr = native_bt.message_packet_end_create(self._bt_ptr, packet._ptr)
 
         if ptr is None:
-            raise bt2._MemoryError("cannot create packet end message object")
+            raise bt2_error._MemoryError("cannot create packet end message object")
 
         return bt2_message._PacketEndMessage(ptr)
 
@@ -413,7 +418,7 @@ class _UserMessageIterator(_MessageIterator):
             ptr = native_bt.message_discarded_events_create(self._bt_ptr, stream._ptr)
 
         if ptr is None:
-            raise bt2._MemoryError("cannot discarded events message object")
+            raise bt2_error._MemoryError("cannot discarded events message object")
 
         msg = bt2_message._DiscardedEventsMessage(ptr)
 
@@ -460,7 +465,7 @@ class _UserMessageIterator(_MessageIterator):
             ptr = native_bt.message_discarded_packets_create(self._bt_ptr, stream._ptr)
 
         if ptr is None:
-            raise bt2._MemoryError("cannot discarded packets message object")
+            raise bt2_error._MemoryError("cannot discarded packets message object")
 
         msg = bt2_message._DiscardedPacketsMessage(ptr)