Merge ssh://github.com/web2py/web2py

VERSION

@@ -1 +1 @@
-Version 2.6.0-development+timestamp.2013.07.03.04.10.20
+Version 2.6.0-development+timestamp.2013.07.03.17.15.42

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.

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)