diff --git a/over/callback.py b/over/callback.py index 252dd8b..40f077f 100644 --- a/over/callback.py +++ b/over/callback.py @@ -87,7 +87,18 @@ def path(exists=False, permissions=None, validators=None): raise PermissionError("%s is not executable" %(arg)) if validators: - for fn, msg_tpl in validators: + if hasattr(validators, "__iter__"): + src = validators + else: + src = [validators] + + for v in src: + if hasattr(v, "__iter__"): + fn, msg_tpl = v + else: + fn = v + msg_tpl = "%%s failed validation by '%s'" %(fn.__name__) + if not fn(path): msg = msg_tpl %(arg) if "%s" in msg_tpl else msg_tpl diff --git a/over/version.py b/over/version.py index 14cbadc..87de0f3 100644 --- a/over/version.py +++ b/over/version.py @@ -4,5 +4,5 @@ major = 2 # VERSION_MAJOR_IDENTIFIER minor = 1 # VERSION_MINOR_IDENTIFIER # VERSION_LAST_MM 2.1 -patch = 3 # VERSION_PATCH_IDENTIFIER -str = "2.1.3" # VERSION_STRING_IDENTIFIER +patch = 4 # VERSION_PATCH_IDENTIFIER +str = "2.1.4" # VERSION_STRING_IDENTIFIER