From 2738d12e0fbb8434e58bfe4b77b5a5c083a677b3 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 20 Oct 2013 16:51:34 -0500 Subject: [PATCH] fixed problem with _ot and rname --- VERSION | 2 +- gluon/dal.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index d75c30d9..a7488a41 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.7.4-stable+timestamp.2013.10.20.15.42.03 +Version 2.7.4-stable+timestamp.2013.10.20.16.50.33 diff --git a/gluon/dal.py b/gluon/dal.py index 8820f83c..6d6f567e 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -195,8 +195,7 @@ CALLABLETYPES = (types.LambdaType, types.FunctionType, TABLE_ARGS = set( ('migrate','primarykey','fake_migrate','format','redefine', 'singular','plural','trigger_name','sequence_name','fields', - 'common_filter','polymodel','table_class','on_define','actual_name', - 'rname')) + 'common_filter','polymodel','table_class','on_define','rname')) SELECT_ARGS = set( ('orderby', 'groupby', 'limitby','required', 'cache', 'left', @@ -8384,7 +8383,7 @@ class Table(object): """ self._actual = False # set to True by define_table() self._tablename = tablename - self._ot = args.get('actual_name') + self._ot = None # args.get('rname') self._rname = args.get('rname') if not self._rname: self._sequence_name = args.get('sequence_name') or \