pep8 and make travis run again
This commit is contained in:
1 parent
9a3e73031b
commit
d746d43be5
1 file changed
+10
-6
+10
-6
@@ -459,7 +459,7 @@ class IS_IN_SET(Validator):
|
|||||||
|
|
||||||
def __call__(self, value):
|
def __call__(self, value):
|
||||||
if self.multiple:
|
if self.multiple:
|
||||||
### if below was values = re.compile("[\w\-:]+").findall(str(value))
|
# if below was values = re.compile("[\w\-:]+").findall(str(value))
|
||||||
if not value:
|
if not value:
|
||||||
values = []
|
values = []
|
||||||
elif isinstance(value, (tuple, list)):
|
elif isinstance(value, (tuple, list)):
|
||||||
@@ -523,7 +523,7 @@ class IS_IN_DB(Validator):
|
|||||||
field = field._id
|
field = field._id
|
||||||
elif isinstance(field, str):
|
elif isinstance(field, str):
|
||||||
items = field.split('.')
|
items = field.split('.')
|
||||||
if len(items)==1:
|
if len(items) == 1:
|
||||||
field = items[0] + '.id'
|
field = items[0] + '.id'
|
||||||
|
|
||||||
(ktable, kfield) = str(field).split('.')
|
(ktable, kfield) = str(field).split('.')
|
||||||
@@ -627,10 +627,10 @@ class IS_IN_DB(Validator):
|
|||||||
else:
|
else:
|
||||||
values = []
|
values = []
|
||||||
|
|
||||||
if field.type in ('id','integer'):
|
if field.type in ('id', 'integer'):
|
||||||
new_values = []
|
new_values = []
|
||||||
for value in values:
|
for value in values:
|
||||||
if not (isinstance(value,(int,long)) or value.isdigit()):
|
if not (isinstance(value, (int, long)) or value.isdigit()):
|
||||||
if self.auto_add:
|
if self.auto_add:
|
||||||
value = str(self.maybe_add(table, self.fieldnames[0], value))
|
value = str(self.maybe_add(table, self.fieldnames[0], value))
|
||||||
else:
|
else:
|
||||||
@@ -657,8 +657,8 @@ class IS_IN_DB(Validator):
|
|||||||
elif count(values) == len(values):
|
elif count(values) == len(values):
|
||||||
return (values, None)
|
return (values, None)
|
||||||
else:
|
else:
|
||||||
if field.type in ('id','integer'):
|
if field.type in ('id', 'integer'):
|
||||||
if isinstance(value,(int,long)) or value.isdigit():
|
if isinstance(value, (int, long)) or value.isdigit():
|
||||||
value = int(value)
|
value = int(value)
|
||||||
elif self.auto_add:
|
elif self.auto_add:
|
||||||
value = self.maybe_add(table, self.fieldnames[0], value)
|
value = self.maybe_add(table, self.fieldnames[0], value)
|
||||||
@@ -2347,6 +2347,7 @@ class IS_DATE_IN_RANGE(IS_DATE):
|
|||||||
(datetime.date(2010, 3, 3), 'oops')
|
(datetime.date(2010, 3, 3), 'oops')
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self,
|
def __init__(self,
|
||||||
minimum=None,
|
minimum=None,
|
||||||
maximum=None,
|
maximum=None,
|
||||||
@@ -2400,6 +2401,7 @@ class IS_DATETIME_IN_RANGE(IS_DATETIME):
|
|||||||
(datetime.datetime(2010, 3, 3, 0, 0), 'oops')
|
(datetime.datetime(2010, 3, 3, 0, 0), 'oops')
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self,
|
def __init__(self,
|
||||||
minimum=None,
|
minimum=None,
|
||||||
maximum=None,
|
maximum=None,
|
||||||
@@ -2705,6 +2707,7 @@ class LazyCrypt(object):
|
|||||||
"""
|
"""
|
||||||
Stores a lazy password hash
|
Stores a lazy password hash
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self, crypt, password):
|
def __init__(self, crypt, password):
|
||||||
"""
|
"""
|
||||||
crypt is an instance of the CRYPT validator,
|
crypt is an instance of the CRYPT validator,
|
||||||
@@ -3695,6 +3698,7 @@ class IS_IPADDRESS(Validator):
|
|||||||
>>> IS_IPADDRESS(subnets='invalidsubnet')('2001::8ffa:fe22:b3af')
|
>>> IS_IPADDRESS(subnets='invalidsubnet')('2001::8ffa:fe22:b3af')
|
||||||
('2001::8ffa:fe22:b3af', 'invalid subnet provided')
|
('2001::8ffa:fe22:b3af', 'invalid subnet provided')
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
minip='0.0.0.0',
|
minip='0.0.0.0',
|
||||||
|
|||||||
Reference in new issue
Block a user