X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bindings%2Fpython%2Fbt2%2Fbt2%2F__init__.py.in;h=dffc7f21f92d9ea831056df0027ea1fb289ee4c5;hb=51c1116e02971704e2e5d56dce9e3af45792c6dd;hp=2cc4baaa51f4837cfda3c5ea6e9bd28ccfaa54f4;hpb=c7eee084ca459af66ba1f6d375fba3f89db93584;p=babeltrace.git

diff --git a/bindings/python/bt2/bt2/__init__.py.in b/bindings/python/bt2/bt2/__init__.py.in
index 2cc4baaa..dffc7f21 100644
--- 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
@@ -76,6 +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.values import *
 from bt2.values import _Value
 
@@ -92,10 +93,6 @@ class Frozen(Error):
     pass
 
 
-class NoSuchPlugin(Error):
-    pass
-
-
 class InvalidQueryObject(Error):
     pass
 
@@ -128,6 +125,10 @@ class IncompleteUserClass(Error):
     pass
 
 
+class CannotConsumeGraph(Error):
+    pass
+
+
 class GraphCanceled(Exception):
     pass
 
@@ -150,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