From 1356dc1ef0783455e208a507fadfa3e491cce57c Mon Sep 17 00:00:00 2001 From: mdipierro Date: Fri, 11 Oct 2013 20:42:51 -0500 Subject: [PATCH] +-int in IS_INT validator --- VERSION | 2 +- gluon/dal.py | 2 +- gluon/validators.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 92ead4c5..6806120e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.7.3-stable+timestamp.2013.10.11.19.30.17 +Version 2.7.3-stable+timestamp.2013.10.11.20.42.02 diff --git a/gluon/dal.py b/gluon/dal.py index 1a63ed47..2d8a2e42 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -8850,7 +8850,7 @@ class Table(object): (typically a uuid field) 'restore' argument is default False; if set True will remove old values in table first. - 'id_map' ff set to None will not map ids. + 'id_map' if set to None will not map ids. The import will keep the id numbers in the restored table. This assumes that there is an field of type id that is integer and in incrementing order. diff --git a/gluon/validators.py b/gluon/validators.py index 588847f5..8378e29d 100644 --- a/gluon/validators.py +++ b/gluon/validators.py @@ -22,7 +22,7 @@ from cStringIO import StringIO from gluon.utils import simple_hash, web2py_uuid, DIGEST_ALG_BY_SIZE from gluon.dal import FieldVirtual, FieldMethod -regex_isint = re.compile('^\-?\d+$') +regex_isint = re.compile('^[\+\-]?\d+$') JSONErrors = (NameError, TypeError, ValueError, AttributeError, KeyError)