X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bindings%2Fpython%2Fbt2%2Fbt2%2F__init__.py.in;h=6a4ead011ec35275a46af633febc90d94b6a1e24;hb=f5a05aa251877738285d55225155720f88e7cd99;hp=0a49b7948a72317baa7ef44c8f2deed5e7d11192;hpb=9ef22b36c2957c00c72d0213a7a1508011c3a820;p=babeltrace.git

diff --git a/bindings/python/bt2/bt2/__init__.py.in b/bindings/python/bt2/bt2/__init__.py.in
index 0a49b794..6a4ead01 100644
--- a/bindings/python/bt2/bt2/__init__.py.in
+++ b/bindings/python/bt2/bt2/__init__.py.in
@@ -24,8 +24,7 @@ __version__ = '@PACKAGE_VERSION@'
 
 
 from bt2.clock_class import *
-from bt2.clock_class import _ClockValue
-from bt2.clock_class_priority_map import *
+from bt2.clock_snapshot import *
 from bt2.component import *
 from bt2.component import _FilterComponent
 from bt2.component import _GenericFilterComponentClass
@@ -43,25 +42,25 @@ from bt2.ctf_writer import *
 from bt2.ctf_writer import _CtfWriterStream
 from bt2.event import _Event
 from bt2.event_class import *
-from bt2.field_types import *
-from bt2.field_types import _FieldType
-from bt2.fields import *
-from bt2.fields import _ArrayField
-from bt2.fields import _EnumerationField
-from bt2.fields import _Field
-from bt2.fields import _FloatingPointNumberField
-from bt2.fields import _IntegerField
-from bt2.fields import _SequenceField
-from bt2.fields import _StringField
-from bt2.fields import _StructureField
-from bt2.fields import _VariantField
+from bt2.field_class import *
+from bt2.field_class import _FieldClass
+from bt2.field import *
+from bt2.field import _ArrayField
+from bt2.field import _EnumerationField
+from bt2.field import _Field
+from bt2.field import _FloatingPointNumberField
+from bt2.field import _IntegerField
+from bt2.field import _SequenceField
+from bt2.field import _StringField
+from bt2.field import _StructureField
+from bt2.field 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,8 +75,9 @@ from bt2.query_executor import *
 from bt2.stream import _Stream
 from bt2.stream_class import *
 from bt2.trace import *
-from bt2.values import *
-from bt2.values import _Value
+from bt2.trace_collection_message_iterator import *
+from bt2.value import *
+from bt2.value import _Value
 
 
 class Error(Exception):
@@ -92,10 +92,6 @@ class Frozen(Error):
     pass
 
 
-class NoSuchPlugin(Error):
-    pass
-
-
 class InvalidQueryObject(Error):
     pass
 
@@ -140,7 +136,7 @@ class QueryExecutorCanceled(Exception):
     pass
 
 
-class NotificationIteratorCanceled(Exception):
+class MessageIteratorCanceled(Exception):
     pass
 
 
@@ -154,14 +150,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