From e56e37689499ceb115676e08bf57a4bd153b3676 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Fri, 3 Jan 2014 20:58:57 -0600 Subject: [PATCH] fixed issue 1836, Problem with IS_IN_DB(label='%(x)3.3s') --- VERSION | 2 +- gluon/validators.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 233d8829..627d6694 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.8.2-stable+timestamp.2013.12.23.21.36.22 +Version 2.8.2-stable+timestamp.2014.01.03.20.58.03 diff --git a/gluon/validators.py b/gluon/validators.py index 0107e43a..1bf11af4 100644 --- a/gluon/validators.py +++ b/gluon/validators.py @@ -458,7 +458,7 @@ class IS_IN_SET(Validator): regex1 = re.compile('\w+\.\w+') -regex2 = re.compile('%\((?P[^\)]+)\)s') +regex2 = re.compile('%\((?P[^\)]+)\)(\d*\.\d*)?[a-zA-Z]') class IS_IN_DB(Validator):