[Zope-Checkins] CVS: Packages/ZConfig - SchemaInfo.py:1.1.2.6

Fred L. Drake, Jr. fred@zope.com
Mon, 9 Dec 2002 13:20:12 -0500


Update of /cvs-repository/Packages/ZConfig
In directory cvs.zope.org:/tmp/cvs-serv23954

Modified Files:
      Tag: zconfig-schema-devel-branch
	SchemaInfo.py 
Log Message:
getchildnames():  Fix two bugs.
isAllowedName():  Handle the case where unnamed sections are allowed.


=== Packages/ZConfig/SchemaInfo.py 1.1.2.5 => 1.1.2.6 ===
--- Packages/ZConfig/SchemaInfo.py:1.1.2.5	Mon Dec  9 13:09:14 2002
+++ Packages/ZConfig/SchemaInfo.py	Mon Dec  9 13:20:12 2002
@@ -101,9 +101,9 @@
             return thing
 
     def getchildnames(self):
-        L = [(i,n) for (n,i,t) in self._keyindex.iteritems()]
+        L = [(i,n) for (n,(i,t)) in self._keyindex.iteritems()]
         L.sort()
-        return [i for (i,n) in L]
+        return [n for (i,n) in L]
 
     def issection(self):
         return True
@@ -116,5 +116,7 @@
             return False
         elif "+" in self.names:
             return bool(name)
+        elif not name:
+            return "*" in self.names
         else:
             return name in self.names