removed circular import for validators

2013-09-13 17:14:47 -05:00
parent 7bc603f380
commit 10a69f4338
2 changed files with 4 additions and 8 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-Version 2.6.1-stable+timestamp.2013.09.13.15.41.09
+Version 2.6.1-stable+timestamp.2013.09.13.17.13.49
--- a/gluon/dal.py
+++ b/gluon/dal.py
@@ -234,12 +234,6 @@ except ImportError:
        except ImportError:
            simplejson = None

-try:
-    from gluon import validators
-    have_validators = True
-except (ImportError, SyntaxError):
-    have_validators = False
-
 LOGGER = logging.getLogger("web2py.dal")
 DEFAULT = lambda:0

@@ -6872,7 +6866,9 @@ def sqlhtml_validators(field):
    fieldtype
    """
    db = field.db
-    if not have_validators:
+    try:
+        from gluon import validators
+    except ImportError:
        return []
    field_type, field_length = field.type, field.length
    if isinstance(field_type, SQLCustomType):