From 5abfa27f3f1fe004f64ad8aab4e42a7ed4c6c892 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Wed, 3 Jul 2013 15:24:24 -0500 Subject: [PATCH 1/2] rows.repr -> rows.render --- VERSION | 2 +- gluon/dal.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 0e4243a1..b23a5d6b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.6.0-development+timestamp.2013.07.03.04.10.20 +Version 2.6.0-development+timestamp.2013.07.03.15.23.30 diff --git a/gluon/dal.py b/gluon/dal.py index 33a72f3f..11b246d0 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -10289,7 +10289,7 @@ class Rows(object): grouped_row_group[value].append(row) return grouped_row_group - def repr(self, i=None, fields=None): + def render(self, i=None, fields=None): """ Takes an index and returns a copy of the indexed row with values transformed via the "represent" attributes of the associated fields. From 0c013f6b5947d050b8b005a982a6abd257600d96 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Wed, 3 Jul 2013 17:16:56 -0500 Subject: [PATCH 2/2] fixed typo, thanks Michele --- VERSION | 2 +- gluon/tools.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index b23a5d6b..7252c8ca 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.6.0-development+timestamp.2013.07.03.15.23.30 +Version 2.6.0-development+timestamp.2013.07.03.17.15.42 diff --git a/gluon/tools.py b/gluon/tools.py index c3bdfeb1..45a0d196 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -4564,7 +4564,7 @@ class Service(object): except: etype, eval, etb = sys.exc_info() data = '%s: %s\n' % (etype.__name__, eval) + str(request.is_local and traceback.format_tb(etb)) - logger.warning('%s: %s\n%s') % (etype.__name__, eval, traceback.format_tb(etb)) + logger.warning('%s: %s\n%s' % (etype.__name__, eval, traceback.format_tb(etb))) return return_error(id, -32099, data=data)