dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reverted error commit

Browse Source
This commit is contained in:
mdipierro
2013-10-09 09:07:00 -05:00
parent 98f2bfbfb6
commit 5428fdbd04
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -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
gluon/compileapp.py
+2 -2
View File
@@ -514,11 +514,11 @@ def run_models_in(environment):
for model in listdir(cpath, '^models_\w+\.pyc$', 0): for model in listdir(cpath, '^models_\w+\.pyc$', 0):
restricted(read_pyc(model), environment, layer=model) restricted(read_pyc(model), environment, layer=model)
path = pjoin(cpath, 'models') path = pjoin(cpath, 'models')
models = listdir(path, '^\w+\.pyc$', 0, sort=True) models = listdir(path, '^\w+\.pyc$', 0, sort=False)
compiled = True compiled = True
else: else:
path = pjoin(folder, 'models') path = pjoin(folder, 'models')
models = listdir(path, '^\w+\.py$', 0, sort=True) models = listdir(path, '^\w+\.py$', 0, sort=False)
compiled = False compiled = False
n = len(path) + 1 n = len(path) + 1
for model in models: for model in models:
gluon/sqlhtml.py
+3 -2
View File
@@ -2273,8 +2273,9 @@ class SQLFORM(FORM):
limitby = None limitby = None
try: try:
# table_fields = filter(lambda f: f.tablename in tablenames, fields) table_fields = filter(
table_fields = filter(lambda f: (f.tablename in tablenames) and (not(isinstance(f,Field.Virtual))),fields) lambda f: (f.tablename in tablenames) and \
(not(isinstance(f,Field.Virtual))),fields)
if dbset._db._adapter.dbengine=='google:datastore': if dbset._db._adapter.dbengine=='google:datastore':
rows = dbset.select(left=left,orderby=orderby, rows = dbset.select(left=left,orderby=orderby,
groupby=groupby,limitby=limitby, groupby=groupby,limitby=limitby,