X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bindings%2Fpython%2Fbt2%2Fbt2%2F__init__.py.in;h=da102f19414c70d3a56220a19636a41318200701;hb=5602ef8155de326402dcb33f40ee4c7d5d693ca5;hp=487addebc12ffa0c5f78d3f5fb80bd1cb1f5f423;hpb=334478b4cd08529b1f5b28c8ef9404c6ed023e14;p=babeltrace.git

diff --git a/bindings/python/bt2/bt2/__init__.py.in b/bindings/python/bt2/bt2/__init__.py.in
index 487addeb..da102f19 100644
--- a/bindings/python/bt2/bt2/__init__.py.in
+++ b/bindings/python/bt2/bt2/__init__.py.in
@@ -57,11 +57,11 @@ from bt2.fields import _StructureField
 from bt2.fields import _VariantField
 from bt2.graph import *
 from bt2.logging import *
-from bt2.notification import *
-from bt2.notification import _DiscardedEventsNotification
-from bt2.notification import _DiscardedPacketsNotification
-from bt2.notification_iterator import *
-from bt2.notification_iterator import _UserNotificationIterator
+from bt2.message import *
+from bt2.message import _DiscardedEventsMessage
+from bt2.message import _DiscardedPacketsMessage
+from bt2.message_iterator import *
+from bt2.message_iterator import _UserMessageIterator
 from bt2.packet import _Packet
 from bt2.plugin import *
 from bt2.port import *
@@ -76,7 +76,7 @@ from bt2.query_executor import *
 from bt2.stream import _Stream
 from bt2.stream_class import *
 from bt2.trace import *
-from bt2.trace_collection_notification_iterator import *
+from bt2.trace_collection_message_iterator import *
 from bt2.values import *
 from bt2.values import _Value
 
@@ -137,7 +137,7 @@ class QueryExecutorCanceled(Exception):
     pass
 
 
-class NotificationIteratorCanceled(Exception):
+class MessageIteratorCanceled(Exception):
     pass
 
 
@@ -151,14 +151,18 @@ class _ListenerHandle:
         self._obj = obj
 
 
-import bt2.native_bt as _native_bt
-import atexit
+def _init_and_register_exit():
+    import bt2.native_bt as _native_bt
+    import atexit
+
+    atexit.register(_native_bt.py3_cc_exit_handler)
+    version = (_native_bt.version_get_major(), _native_bt.version_get_minor(),
+               _native_bt.version_get_patch(), _native_bt.version_get_extra())
+    _native_bt.py3_cc_init_from_bt2()
+
+
+_init_and_register_exit()
 
-atexit.register(_native_bt.py3_cc_exit_handler)
-version = (_native_bt.version_get_major(), _native_bt.version_get_minor(),
-           _native_bt.version_get_patch(), _native_bt.version_get_extra())
-_native_bt.py3_cc_init_from_bt2()
-del _native_bt
 
 try:
     del native_bt