From 5ec22132a32799c47f54083062066480a8045097 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Thu, 11 Jul 2013 09:14:41 -0500 Subject: [PATCH] sync'd with gluino again --- VERSION | 2 +- gluon/sqlhtml.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 7d9d629c..47053d68 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.6.0-development+timestamp.2013.07.09.16.14.32 +Version 2.6.0-development+timestamp.2013.07.11.09.13.54 diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index ade7fad4..a2a413ae 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -37,16 +37,15 @@ import datetime import urllib import re import cStringIO -from gluon import current, redirect +from globals import current +from http import redirect import inspect try: import settings is_gae = settings.global_settings.web2py_runtime_gae except ImportError: - is_gae = False - - + is_gae = False # this is an assumption (if settings missing) table_field = re.compile('[\w_]+\.[\w_]+') widget_class = re.compile('^\w*')