diff --git a/VERSION b/VERSION index f09ce59c..3bcde7c7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.7.2-stable+timestamp.2013.10.07.09.16.58 +Version 2.7.2-stable+timestamp.2013.10.09.09.04.33 diff --git a/gluon/compileapp.py b/gluon/compileapp.py index 5fa14a70..bede5c9e 100644 --- a/gluon/compileapp.py +++ b/gluon/compileapp.py @@ -514,11 +514,11 @@ def run_models_in(environment): for model in listdir(cpath, '^models_\w+\.pyc$', 0): restricted(read_pyc(model), environment, layer=model) path = pjoin(cpath, 'models') - models = listdir(path, '^\w+\.pyc$', 0, sort=True) + models = listdir(path, '^\w+\.pyc$', 0, sort=False) compiled = True else: path = pjoin(folder, 'models') - models = listdir(path, '^\w+\.py$', 0, sort=True) + models = listdir(path, '^\w+\.py$', 0, sort=False) compiled = False n = len(path) + 1 for model in models: diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index 5e348a50..39ace8e1 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -2273,8 +2273,9 @@ class SQLFORM(FORM): limitby = None try: - # table_fields = filter(lambda f: f.tablename in tablenames, fields) - table_fields = filter(lambda f: (f.tablename in tablenames) and (not(isinstance(f,Field.Virtual))),fields) + table_fields = filter( + lambda f: (f.tablename in tablenames) and \ + (not(isinstance(f,Field.Virtual))),fields) if dbset._db._adapter.dbengine=='google:datastore': rows = dbset.select(left=left,orderby=orderby, groupby=groupby,limitby=limitby,