Fixed xmlrpc_test.fuzzy_digits for Fedora12

This commit is contained in:
Jason Gerard DeRose 2010-01-10 17:47:15 -07:00 committed by Rob Crittenden
parent d6ca88f331
commit e9dc9de23a
2 changed files with 2 additions and 2 deletions

View File

@ -32,7 +32,7 @@ from ipalib import errors
# Matches a gidnumber like '1391016742'
# FIXME: Does it make more sense to return gidnumber, uidnumber, etc. as `int`
# or `long`? If not, we still need to return them as `unicode` instead of `str`.
fuzzy_digits = Fuzzy('^\d+$', type=str)
fuzzy_digits = Fuzzy('^\d+$', type=basestring)
# Matches an ipauniqueid like u'784d85fd-eae7-11de-9d01-54520012478b'
fuzzy_uuid = Fuzzy(

View File

@ -210,7 +210,7 @@ class Fuzzy(object):
self.re = re.compile(regex)
if type is None:
type = unicode
assert type in (unicode, str)
assert type in (unicode, str, basestring)
self.regex = regex
self.type = type
self.test = test