From 288209fbdd2f5841f731274b940a0948ea742a9b Mon Sep 17 00:00:00 2001 From: Amit Margalit Date: Tue, 20 Aug 2013 09:30:38 +0300 Subject: [PATCH] Fix (python): use of braces in format strings MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Using braces in format strings without specifying a number (e.g. "The number {} is incorrect".format(some_variable)) is available since Python 2.7, and older Python 2.6 required a number, zero-based (e.g. "The number {0} is incorrect"). This patch adds these numbers for the sake of older systems. Acked-by: Jérémie Galarneau Signed-off-by: Amit Margalit Signed-off-by: Mathieu Desnoyers --- bindings/python/babeltrace.i.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bindings/python/babeltrace.i.in b/bindings/python/babeltrace.i.in index 16dbbbde..24581604 100644 --- a/bindings/python/babeltrace.i.in +++ b/bindings/python/babeltrace.i.in @@ -477,7 +477,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.""" @@ -832,7 +832,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): @@ -926,7 +926,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""" @@ -965,7 +965,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""" @@ -1085,7 +1085,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): -- 2.34.1