[Zodb-checkins] CVS: Zope/lib/python/ZConfig - info.py:1.13

[Fred L. Drake, Jr.]

Update of /cvs-repository/Zope/lib/python/ZConfig
In directory cvs.zope.org:/tmp/cvs-serv5557

Modified Files:
	info.py 
Log Message:
Remove a bit more double-indirection from the internal data
structures.


=== Zope/lib/python/ZConfig/info.py 1.12 => 1.13 ===
--- Zope/lib/python/ZConfig/info.py:1.12	Mon Mar 24 11:57:59 2003
+++ Zope/lib/python/ZConfig/info.py	Mon Mar 24 12:07:29 2003
@@ -249,8 +249,8 @@
         self.handler = None
         self.registry = registry
         self._children = []    # [(key, info), ...]
-        self._attrmap = {}     # {attribute: index, ...}
-        self._keymap = {}      # {key: index, ...}
+        self._attrmap = {}     # {attribute: info, ...}
+        self._keymap = {}      # {key: info, ...}
         self._types = types
 
     def gettype(self, name):
@@ -280,9 +280,9 @@
                 "child attribute name %s already used" % info.attribute)
         # a-ok, add the item to the appropriate maps
         if info.attribute:
-            self._attrmap[info.attribute] = len(self._children)
+            self._attrmap[info.attribute] = info
         if key:
-            self._keymap[key] = len(self._children)
+            self._keymap[key] = info
         self._children.append((key, info))
 
     def addkey(self, keyinfo):
@@ -296,11 +296,10 @@
         if not key:
             raise ZConfig.ConfigurationError(
                 "cannot match a key without a name")
-        index = self._keymap.get(key)
-        if index is None:
+        try:
+            return self._keymap[key]
+        except KeyError:
             raise ZConfig.ConfigurationError("no key matching " + `key`)
-        else:
-            return self._children[index][1]
 
     def getchildnames(self):
         return [key for (key, info) in self._children]