removed teritem which breaks py3

This commit is contained in:
mdipierro
2019-02-25 21:44:53 -08:00
parent 818494d0f3
commit d5d2cf55de
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -44,7 +44,7 @@ rmfiles:
rm -rf applications/examples/uploads/* rm -rf applications/examples/uploads/*
src: src:
### Use semantic versioning ### Use semantic versioning
echo 'Version 2.18.1-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION echo 'Version 2.18.2-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
### rm -f all junk files ### rm -f all junk files
#make clean #make clean
# make rmfiles # make rmfiles
+1 -1
View File
@@ -3424,7 +3424,7 @@ class SQLTABLE(TABLE):
fieldmap = dict(zip(sqlrows.colnames, fieldlist)) fieldmap = dict(zip(sqlrows.colnames, fieldlist))
if columns: if columns:
tablenames = [] tablenames = []
for colname, field in fieldmap.iteritems(): for colname, field in fieldmap.items():
if isinstance(field, (Field, Field.Virtual)): if isinstance(field, (Field, Field.Virtual)):
tablenames.append(field.tablename) tablenames.append(field.tablename)
elif isinstance(field, Expression): elif isinstance(field, Expression):
+1 -1
View File
@@ -20,9 +20,9 @@ from .test_compileapp import *
from .test_appadmin import * from .test_appadmin import *
from .test_web import * from .test_web import *
from .test_sqlhtml import * from .test_sqlhtml import *
# from .test_scheduler import *
from .test_cron import * from .test_cron import *
from .test_is_url import * from .test_is_url import *
from .test_scheduler import *
if sys.version[:3] == '2.7': if sys.version[:3] == '2.7':
from .test_old_doctests import * from .test_old_doctests import *