IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-23 15:40:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

62: NameSpace no longer takes base=base kwarg

Browse Source
This commit is contained in:
Jason Gerard DeRose 2008-08-06 15:06:39 +00:00
parent 4e825ba2d9
commit 495f96a73f
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ipalib/plugable.py
View File

@ -174,13 +174,12 @@ class NameSpace(ReadOnly):
both as instance attributes and as dictionary items. both as instance attributes and as dictionary items.
""" """
def __init__(self, items, base=None): def __init__(self, items):
""" """
`items` should be an iterable providing the members of this `items` should be an iterable providing the members of this
NameSpace. NameSpace.
""" """
object.__setattr__(self, '_NameSpace__items', tuple(items)) object.__setattr__(self, '_NameSpace__items', tuple(items))
object.__setattr__(self, '_NameSpace__base', base)
# dict mapping Python name to item: # dict mapping Python name to item:
object.__setattr__(self, '_NameSpace__pname', {}) object.__setattr__(self, '_NameSpace__pname', {})
@ -229,11 +228,7 @@ class NameSpace(ReadOnly):
raise KeyError('NameSpace has no item for key %r' % key) raise KeyError('NameSpace has no item for key %r' % key)
def __repr__(self): def __repr__(self):
if self.__base is None: return '%s(<%d proxies>)' % (self.__class__.__name__, len(self))
base = repr(self.__base)
else:
base = '%s.%s' % (self.__base.__module__, self.__base.__name__)
return '%s(*proxies, base=%s)' % (self.__class__.__name__, base)
class Registrar(object): class Registrar(object):
@ -338,7 +333,7 @@ class API(ReadOnly):
Finalize the registration, instantiate the plugins. Finalize the registration, instantiate the plugins.
""" """
for (base, plugins) in self.register: for (base, plugins) in self.register:
ns = NameSpace(self.__plugin_iter(base, plugins), base=base) ns = NameSpace(self.__plugin_iter(base, plugins))
assert not hasattr(self, base.__name__) assert not hasattr(self, base.__name__)
object.__setattr__(self, base.__name__, ns) object.__setattr__(self, base.__name__, ns)
for plugin in self.__plugins: for plugin in self.__plugins: