summaryrefslogtreecommitdiffstats
path: root/ipalib/parameters.py
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2015-09-21 14:15:00 +0200
committerTomas Babej <tbabej@redhat.com>2015-10-13 14:16:32 +0200
commit614b490402abddece94846298f6e40414844cd9b (patch)
treee56890f88cbdfaa9e333d02d3e442f69e2dba7af /ipalib/parameters.py
parente0eff8b8346f62b667f5e5b923fcaccd1beb12b7 (diff)
downloadfreeipa-614b490402abddece94846298f6e40414844cd9b.tar.gz
freeipa-614b490402abddece94846298f6e40414844cd9b.tar.xz
freeipa-614b490402abddece94846298f6e40414844cd9b.zip
ipalib.parameters: Require bytes for Bytes.pattern
Reviewed-By: Tomas Babej <tbabej@redhat.com>
Diffstat (limited to 'ipalib/parameters.py')
-rw-r--r--ipalib/parameters.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/ipalib/parameters.py b/ipalib/parameters.py
index 8d27d900a..ef8814eeb 100644
--- a/ipalib/parameters.py
+++ b/ipalib/parameters.py
@@ -1270,7 +1270,6 @@ class Data(Param):
('minlength', int, None),
('maxlength', int, None),
('length', int, None),
- ('pattern', (six.string_types,), None),
('pattern_errmsg', (six.string_types,), None),
)
@@ -1338,6 +1337,9 @@ class Bytes(Data):
type = bytes
type_error = _('must be binary data')
+ kwargs = Data.kwargs + (
+ ('pattern', (bytes,), None),
+ )
def __init__(self, name, *rules, **kw):
if kw.get('pattern', None) is None:
@@ -1399,6 +1401,7 @@ class Str(Data):
"""
kwargs = Data.kwargs + (
+ ('pattern', (six.string_types,), None),
('noextrawhitespace', bool, True),
)