bt2: Mass field_types -> field_class rename

[babeltrace.git] / bindings / python / bt2 / bt2 / __init__.py.in

diff --git a/bindings/python/bt2/bt2/__init__.py.in b/bindings/python/bt2/bt2/__init__.py.in
index ebab24ab780ace043984a0603686f4d3b53a1425..48668110f8992ff7e3b169d335c1e2dc7981351a 100644 (file)
--- a/bindings/python/bt2/bt2/__init__.py.in
+++ b/bindings/python/bt2/bt2/__init__.py.in
@@ -24,8 +24,8 @@ __version__ = '@PACKAGE_VERSION@'
 
 
 from bt2.clock_class import *
-from bt2.clock_class import _ClockValue
 from bt2.clock_class_priority_map import *
+from bt2.clock_value import *
 from bt2.component import *
 from bt2.component import _FilterComponent
 from bt2.component import _GenericFilterComponentClass
@@ -43,8 +43,8 @@ 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.field_class import *
+from bt2.field_class import _FieldClass
 from bt2.fields import *
 from bt2.fields import _ArrayField
 from bt2.fields import _EnumerationField
@@ -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 *
@@ -72,9 +72,11 @@ from bt2.port import _PrivateInputPort
 from bt2.port import _PrivateOutputPort
 from bt2.port import _PrivatePort
 from bt2.py_plugin import *
+from bt2.query_executor import *
 from bt2.stream import _Stream
 from bt2.stream_class import *
 from bt2.trace import *
+from bt2.trace_collection_message_iterator import *
 from bt2.values import *
 from bt2.values import _Value
 
@@ -91,7 +93,11 @@ class Frozen(Error):
     pass
 
 
-class NoSuchPlugin(Error):
+class InvalidQueryObject(Error):
+    pass
+
+
+class InvalidQueryParams(Error):
     pass
 
 
@@ -119,11 +125,19 @@ class IncompleteUserClass(Error):
     pass
 
 
+class CannotConsumeGraph(Error):
+    pass
+
+
 class GraphCanceled(Exception):
     pass
 
 
-class NotificationIteratorCanceled(Exception):
+class QueryExecutorCanceled(Exception):
+    pass
+
+
+class MessageIteratorCanceled(Exception):
     pass
 
 
@@ -137,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