X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=bindings%2Fpython%2Fbabeltrace.i.in;h=bd2d740c5f51fa1ad39fa944a3487dbf2ffa3a84;hp=06b8d406dfc8842cab8e9d4887a2d101883ef4d6;hb=515d3e63070e76440856bb9a123e9b3fb82d5fb5;hpb=2c0df20434631335fda4b58ea531632c20b349a3

diff --git a/bindings/python/babeltrace.i.in b/bindings/python/babeltrace.i.in
index 06b8d406..bd2d740c 100644
--- a/bindings/python/babeltrace.i.in
+++ b/bindings/python/babeltrace.i.in
@@ -53,6 +53,7 @@ trace to it."
 typedef unsigned long long uint64_t;
 typedef long long int64_t;
 typedef int bt_intern_str;
+typedef unsigned long ssize_t;
 
 /* =================================================================
 		CONTEXT.H, CONTEXT-INTERNAL.H
@@ -188,10 +189,12 @@ class Context:
 %rename("lookup_format") bt_lookup_format(bt_intern_str qname);
 %rename("_bt_print_format_list") bt_fprintf_format_list(FILE *fp);
 %rename("register_format") bt_register_format(struct format *format);
+%rename("unregister_format") bt_unregister_format(struct bt_format *format);
 
 extern struct format *bt_lookup_format(bt_intern_str qname);
 extern void bt_fprintf_format_list(FILE *fp);
 extern int bt_register_format(struct bt_format *format);
+extern void bt_unregister_format(struct bt_format *format);
 
 %pythoncode %{
 
@@ -475,7 +478,7 @@ class TraceHandle(object):
 		raise NotImplementedError("TraceHandle cannot be instantiated")
 
 	def __repr__(self):
-		return "Babeltrace TraceHandle: trace_id('{}')".format(self._id)
+		return "Babeltrace TraceHandle: trace_id('{0}')".format(self._id)
 
 	def get_id(self):
 		"""Return the TraceHandle id."""
@@ -830,7 +833,7 @@ class ctf:
 			raise NotImplementedError("ctf.Definition cannot be instantiated")
 
 		def __repr__(self):
-			return "Babeltrace Definition: name('{}'), type({})".format(
+			return "Babeltrace Definition: name('{0}'), type({1})".format(
 				self.field_name(), self.field_type())
 
 		def field_name(self):
@@ -864,7 +867,7 @@ class ctf:
 			Return the size, in bits, of an int or a negative
 			value on error.
 			"""
-			return _bt_ctf_get_int_len(self._d)
+			return _bt_ctf_get_int_len(_bt_ctf_get_decl_from_def(self._d))
 
 		def get_encoding(self):
 			"""
@@ -924,7 +927,7 @@ class ctf:
 			raise NotImplementedError("ctf.EventDecl cannot be instantiated")
 
 		def __repr__(self):
-			return "Babeltrace EventDecl: name {}".format(self.get_name())
+			return "Babeltrace EventDecl: name {0}".format(self.get_name())
 
 		def get_name(self):
 			"""Return the name of the event or None on error"""
@@ -963,7 +966,7 @@ class ctf:
 			raise NotImplementedError("ctf.FieldDecl cannot be instantiated")
 
 		def __repr__(self):
-			return "Babeltrace FieldDecl: name {}".format(self.get_name())
+			return "Babeltrace FieldDecl: name {0}".format(self.get_name())
 
 		def get_name(self):
 			"""Return the name of a FieldDecl or None on error"""
@@ -1083,7 +1086,7 @@ class File(object):
 			stat = 'opened'
 		else:
 			stat = 'closed'
-		return "{} babeltrace File; file_path('{}'), mode('{}')".format(
+		return "{0} babeltrace File; file_path('{1}'), mode('{2}')".format(
 			stat, self._file_path, self._mode)
 
 	def close(self):