IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

230: Renamed allow_None kwarg to allow_none

Browse Source
This commit is contained in:
Jason Gerard DeRose
2008-09-02 17:44:07 +00:00
parent f2da06c5cf
commit bc08225dcd
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ipalib/errors.py
View File

@@ -63,22 +63,22 @@ def raise_TypeError(value, type_, name):
raise e raise e
def check_type(value, type_, name, allow_None=False): def check_type(value, type_, name, allow_none=False):
assert type(name) is str, TYPE_FORMAT % ('name', str, name) assert type(name) is str, TYPE_FORMAT % ('name', str, name)
assert type(type_) is type, TYPE_FORMAT % ('type_', type, type_) assert type(type_) is type, TYPE_FORMAT % ('type_', type, type_)
assert type(allow_None) is bool, TYPE_FORMAT % ('allow_None', bool, allow_None) assert type(allow_none) is bool, TYPE_FORMAT % ('allow_none', bool, allow_none)
if value is None and allow_None: if value is None and allow_none:
return return
if type(value) is not type_: if type(value) is not type_:
raise_TypeError(value, type_, name) raise_TypeError(value, type_, name)
return value return value
def check_isinstance(value, type_, name, allow_None=False): def check_isinstance(value, type_, name, allow_none=False):
assert type(type_) is type, TYPE_FORMAT % ('type_', type, type_) assert type(type_) is type, TYPE_FORMAT % ('type_', type, type_)
assert type(name) is str, TYPE_FORMAT % ('name', str, name) assert type(name) is str, TYPE_FORMAT % ('name', str, name)
assert type(allow_None) is bool, TYPE_FORMAT % ('allow_None', bool, allow_None) assert type(allow_none) is bool, TYPE_FORMAT % ('allow_none', bool, allow_none)
if value is None and allow_None: if value is None and allow_none:
return return
if not isinstance(value, type_): if not isinstance(value, type_):
raise_TypeError(value, type_, name) raise_TypeError(value, type_, name)

2
ipalib/public.py
View File

@@ -95,7 +95,7 @@ class Option2(plugable.ReadOnly):
self.multivalue = check_type(multivalue, bool, 'multivalue') self.multivalue = check_type(multivalue, bool, 'multivalue')
self.default = default self.default = default
self.default_from = check_type(default_from, self.default_from = check_type(default_from,
DefaultFrom, 'default_from', allow_None=True) DefaultFrom, 'default_from', allow_none=True)
self.__normalize = normalize self.__normalize = normalize
self.rules = (type_.validate,) + rules self.rules = (type_.validate,) + rules
lock(self) lock(self)

16
ipalib/tests/test_errors.py
View File

@@ -74,7 +74,7 @@ def test_check_type():
# Should pass: # Should pass:
assert value is f(value, type_, name) assert value is f(value, type_, name)
assert None is f(None, type_, name, allow_None=True) assert None is f(None, type_, name, allow_none=True)
# Should raise TypeError # Should raise TypeError
check_TypeError(f, None, type_, name) check_TypeError(f, None, type_, name)
@@ -91,10 +91,10 @@ def test_check_type():
e = raises(AssertionError, f, value, fail_type, name) e = raises(AssertionError, f, value, fail_type, name)
assert str(e) == type_format % ('type_', type, fail_type) assert str(e) == type_format % ('type_', type, fail_type)
# allow_None not a bool: # allow_none not a bool:
fail_bool = 0 fail_bool = 0
e = raises(AssertionError, f, value, type_, name, allow_None=fail_bool) e = raises(AssertionError, f, value, type_, name, allow_none=fail_bool)
assert str(e) == type_format % ('allow_None', bool, fail_bool) assert str(e) == type_format % ('allow_none', bool, fail_bool)
def test_check_isinstance(): def test_check_isinstance():
@@ -109,7 +109,7 @@ def test_check_isinstance():
# Should pass: # Should pass:
assert value is f(value, type_, name) assert value is f(value, type_, name)
assert value is f(value, basestring, name) assert value is f(value, basestring, name)
assert None is f(None, type_, name, allow_None=True) assert None is f(None, type_, name, allow_none=True)
# Should raise TypeError # Should raise TypeError
check_TypeError(f, None, type_, name) check_TypeError(f, None, type_, name)
@@ -125,7 +125,7 @@ def test_check_isinstance():
e = raises(AssertionError, f, value, fail_type, name) e = raises(AssertionError, f, value, fail_type, name)
assert str(e) == type_format % ('type_', type, fail_type) assert str(e) == type_format % ('type_', type, fail_type)
# allow_None not a bool: # allow_none not a bool:
fail_bool = 0 fail_bool = 0
e = raises(AssertionError, f, value, type_, name, allow_None=fail_bool) e = raises(AssertionError, f, value, type_, name, allow_none=fail_bool)
assert str(e) == type_format % ('allow_None', bool, fail_bool) assert str(e) == type_format % ('allow_none', bool, fail_bool)