diff --git a/VERSION b/VERSION index 7b8b5bcb..c828a570 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.6.0-development+timestamp.2013.07.20.12.59.52 +Version 2.6.0-development+timestamp.2013.07.21.16.55.15 diff --git a/gluon/dal.py b/gluon/dal.py index 1aa424aa..60f2e467 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -6876,8 +6876,8 @@ class Row(object): key=str(k) _extra = self.__dict__.get('_extra', None) if _extra is not None: - v = _extra.get(key, r'[__+-+_key_not_found_+-+__]') - if v != r'[__+-+_key_not_found_+-+__]': + v = _extra.get(key, DEFAULT) + if v != DEFAULT: return v m = REGEX_TABLE_DOT_FIELD.match(key) if m: