diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2015-09-21 14:15:00 +0200 |
|---|---|---|
| committer | Tomas Babej <tbabej@redhat.com> | 2015-10-13 14:16:32 +0200 |
| commit | 614b490402abddece94846298f6e40414844cd9b (patch) | |
| tree | e56890f88cbdfaa9e333d02d3e442f69e2dba7af | |
| parent | e0eff8b8346f62b667f5e5b923fcaccd1beb12b7 (diff) | |
| download | freeipa-614b490402abddece94846298f6e40414844cd9b.tar.gz freeipa-614b490402abddece94846298f6e40414844cd9b.tar.xz freeipa-614b490402abddece94846298f6e40414844cd9b.zip | |
ipalib.parameters: Require bytes for Bytes.pattern
Reviewed-By: Tomas Babej <tbabej@redhat.com>
| -rw-r--r-- | ipalib/parameters.py | 5 | ||||
| -rw-r--r-- | ipatests/test_ipalib/test_parameters.py | 1 |
2 files changed, 4 insertions, 2 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), ) diff --git a/ipatests/test_ipalib/test_parameters.py b/ipatests/test_ipalib/test_parameters.py index 5504a52b5..d6e510635 100644 --- a/ipatests/test_ipalib/test_parameters.py +++ b/ipatests/test_ipalib/test_parameters.py @@ -692,7 +692,6 @@ class test_Data(ClassChecker): assert o.minlength is None assert o.maxlength is None assert o.length is None - assert o.pattern is None # Test mixing length with minlength or maxlength: o = self.cls('my_data', length=5) |