mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
228: plugable.check_name() now uses errors.check_type()
This commit is contained in:
@@ -28,6 +28,7 @@ http://docs.python.org/ref/sequence-types.html
|
||||
import re
|
||||
import inspect
|
||||
import errors
|
||||
from errors import check_type, check_isinstance
|
||||
|
||||
|
||||
class ReadOnly(object):
|
||||
@@ -466,7 +467,7 @@ def check_name(name):
|
||||
|
||||
:param name: Identifier to test.
|
||||
"""
|
||||
assert type(name) is str, 'must be %r' % str
|
||||
check_type(name, str, 'name')
|
||||
regex = r'^[a-z][_a-z0-9]*[a-z0-9]$'
|
||||
if re.match(regex, name) is None:
|
||||
raise errors.NameSpaceError(name, regex)
|
||||
|
||||
@@ -549,6 +549,8 @@ def test_check_name():
|
||||
]
|
||||
for name in okay:
|
||||
assert name is f(name)
|
||||
e = raises(TypeError, f, unicode(name))
|
||||
assert str(e) == errors.TYPE_FORMAT % ('name', str, unicode(name))
|
||||
for name in nope:
|
||||
raises(errors.NameSpaceError, f, name)
|
||||
for name in okay:
|
||||
|
||||
Reference in New Issue
Block a user