new (third and hopefully last) implementation of the basic MultiKeyDict class

git-svn-id: svn://svn.cy55.de/Zope3/src/cybertools/trunk@1518 fd906abe-77d9-0310-91a1-e0d9ade77398
This commit is contained in:
helmutm 2006-11-23 09:14:49 +00:00
parent c9fbf9f2d3
commit 2af397120c
2 changed files with 22 additions and 39 deletions

View file

@ -42,7 +42,7 @@ The more on the left a matching key part is the higher is its priority:
>>> registry[('index.html', 'task', 'bugfixes', 'Custom')] >>> registry[('index.html', 'task', 'bugfixes', 'Custom')]
'Global index.html for Custom skin' 'Global index.html for Custom skin'
Index entries that are present in the stored dictionaries must always match: Index entries that are present in the stored dictionary must always match:
>>> registry[('edit.html', 'topic', 'zope3', 'Custom')] = 'very special edit.html' >>> registry[('edit.html', 'topic', 'zope3', 'Custom')] = 'very special edit.html'
@ -62,4 +62,3 @@ Index entries that are present in the stored dictionaries must always match:
>>> registry[('edit.html', 'task', 'bugfixes', 'Custom')] >>> registry[('edit.html', 'task', 'bugfixes', 'Custom')]
'edit.html for Custom skin' 'edit.html for Custom skin'

View file

@ -24,23 +24,24 @@ $Id$
_not_found = object() _not_found = object()
class MultiKeyDict(dict): class MultiKeyDict(object):
def __init__(self, keylen=None, **kw): def __init__(self, keylen=None):
super(MultiKeyDict, self).__init__(**kw)
self.submapping = {}
self.keylen = keylen self.keylen = keylen
self.mapping = {}
def __setitem__(self, key, value): def __setitem__(self, key, value):
assert type(key) is tuple assert type(key) is tuple
assert len(key) > 0
if self.keylen is None: if self.keylen is None:
self.keylen = len(key) self.keylen = len(key)
assert len(key) == self.keylen assert len(key) == self.keylen
k0 = key[0] mapping = self.mapping
if len(key) > 1: for n, k in enumerate(key):
sub = self.submapping.setdefault(k0, MultiKeyDict(self.keylen-1)) if n == self.keylen - 1:
sub[key[1:]] = value mapping[k] = value
super(MultiKeyDict, self).__setitem__(k0, value) else:
mapping = mapping.setdefault(k, {})
def __getitem__(self, key): def __getitem__(self, key):
r = self.get(key, _not_found) r = self.get(key, _not_found)
@ -51,33 +52,16 @@ class MultiKeyDict(dict):
def get(self, key, default=None): def get(self, key, default=None):
assert type(key) is tuple assert type(key) is tuple
assert len(key) == self.keylen assert len(key) == self.keylen
k0 = key[0] mapping = self.mapping
rsub = _not_found for n, k in enumerate(key):
r0 = super(MultiKeyDict, self).get(k0, _not_found) entry = mapping.get(k, _not_found)
if r0 is _not_found: if entry == _not_found:
r0 = self.getFallback(k0) entry = self._fallback(mapping, k)
if r0 is _not_found: if entry == _not_found:
return default return default
if len(key) > 1: mapping = entry
sub = self.submapping.get(k0, _not_found) return entry
if sub is _not_found:
sub = self.getSubmappingFallback(key)
if sub is _not_found:
rsub = _not_found
else:
rsub = sub.get(key[1:], _not_found)
if rsub is _not_found:
return default
result = rsub is _not_found and r0 or rsub
return result is _not_found and default or result
def getFallback(self, key): def _fallback(self, mapping, key):
return super(MultiKeyDict, self).get(None, _not_found) return mapping.get(None, _not_found)
def getSubmappingFallback(self, key):
return self.submapping.get(None, _not_found)
def __repr__(self):
return ('<MultiKeyDict %s; submapping: %s>'
% (super(MultiKeyDict, self).__repr__(), `self.submapping`))