From ea14c5b83bbd3bf2e9d1196a3fca3b3ed1c01748 Mon Sep 17 00:00:00 2001 From: gi0baro Date: Wed, 24 Dec 2014 15:19:34 +0100 Subject: [PATCH] DAL.validators_method become a bound method, requires dal instance as first parameter --- gluon/dal.py | 3 +-- gluon/sqlhtml.py | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gluon/dal.py b/gluon/dal.py index 6c1827f7..fe73fa13 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -4,7 +4,7 @@ from pydal import DAL as pyDAL from pydal import Field, SQLCustomType, geoPoint, geoLine, geoPolygon -def _default_validators(field): +def _default_validators(db, field): """ Field type validation, using web2py's validators mechanism. @@ -12,7 +12,6 @@ def _default_validators(field): fieldtype """ from gluon import validators - db = field.db field_type, field_length = field.type, field.length requires = [] diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index 4c8b7046..87b40adc 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -1127,7 +1127,8 @@ class SQLFORM(FORM): extra_field.table = table extra_field.tablename = table._tablename if extra_field.requires == DEFAULT: - extra_field.requires = _default_validators(extra_field) + extra_field.requires = _default_validators(table._db, + extra_field) for fieldname in self.fields: if fieldname.find('.') >= 0: