From d5d2cf55deb2c7be43b6b8ff890bd5af10e3bf1c Mon Sep 17 00:00:00 2001 From: mdipierro Date: Mon, 25 Feb 2019 21:44:53 -0800 Subject: [PATCH] removed teritem which breaks py3 --- Makefile | 2 +- gluon/sqlhtml.py | 2 +- gluon/tests/__init__.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ec5f6eeb..af624c68 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ rmfiles: rm -rf applications/examples/uploads/* src: ### 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 #make clean # make rmfiles diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index dea739f6..fa54f498 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -3424,7 +3424,7 @@ class SQLTABLE(TABLE): fieldmap = dict(zip(sqlrows.colnames, fieldlist)) if columns: tablenames = [] - for colname, field in fieldmap.iteritems(): + for colname, field in fieldmap.items(): if isinstance(field, (Field, Field.Virtual)): tablenames.append(field.tablename) elif isinstance(field, Expression): diff --git a/gluon/tests/__init__.py b/gluon/tests/__init__.py index 35f79fce..60c0b91c 100644 --- a/gluon/tests/__init__.py +++ b/gluon/tests/__init__.py @@ -20,9 +20,9 @@ from .test_compileapp import * from .test_appadmin import * from .test_web import * from .test_sqlhtml import * -# from .test_scheduler import * from .test_cron import * from .test_is_url import * +from .test_scheduler import * if sys.version[:3] == '2.7': from .test_old_doctests import *