X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2F__init__.py.in;h=0faede10cc664ed514f54099296e08d081e1b55c;hp=98a1eb5d4e214718bc6fb52cfccbf4e979804d4b;hb=d24d56638469189904fb6ddbb3c725817b3e9417;hpb=15caa1ca4fac30bd196602bd136e48fda3892de2

diff --git a/src/bindings/python/bt2/bt2/__init__.py.in b/src/bindings/python/bt2/bt2/__init__.py.in
index 98a1eb5d..0faede10 100644
--- a/src/bindings/python/bt2/bt2/__init__.py.in
+++ b/src/bindings/python/bt2/bt2/__init__.py.in
@@ -74,31 +74,35 @@ class CreationError(Error):
     '''Raised when object creation fails due to memory issues.'''
 
 
-class InvalidQueryObject(Error):
+class InvalidObject(Error):
     pass
 
 
-class InvalidQueryParams(Error):
+class InvalidParams(Error):
     pass
 
 
-class TryAgain(Exception):
+class OverflowError(OverflowError):
     pass
 
 
-class Stop(StopIteration):
+class Unsupported(Exception):
     pass
 
 
-class IncompleteUserClass(Error):
+class TryAgain(Exception):
     pass
 
 
-class GraphCanceled(Exception):
+class Stop(StopIteration):
+    pass
+
+
+class IncompleteUserClass(Error):
     pass
 
 
-class QueryExecutorCanceled(Exception):
+class Canceled(Exception):
     pass
 
 
@@ -106,7 +110,7 @@ class NonexistentClockSnapshot(Error):
     pass
 
 
-class PluginLoadingError(Error):
+class LoadingError(Error):
     pass
 
 
@@ -120,10 +124,10 @@ def _init_and_register_exit():
     import bt2.native_bt as _native_bt
     import atexit
 
-    atexit.register(_native_bt.py3_cc_exit_handler)
+    atexit.register(_native_bt.bt2_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()
+    _native_bt.bt2_cc_init_from_bt2()
 
 
 _init_and_register_exit()