[Zope3-checkins] CVS: Zope3/src/ZConfig - info.py:1.14.24.1 matcher.py:1.12.10.1

[Grégoire Weber]

Update of /cvs-repository/Zope3/src/ZConfig
In directory cvs.zope.org:/tmp/cvs-serv24874/src/ZConfig

Modified Files:
      Tag: cw-mail-branch
	info.py matcher.py 
Log Message:
Synced up with HEAD

=== Zope3/src/ZConfig/info.py 1.14 => 1.14.24.1 ===
--- Zope3/src/ZConfig/info.py:1.14	Mon Mar 24 12:09:48 2003
+++ Zope3/src/ZConfig/info.py	Sun Jun 22 10:22:21 2003
@@ -247,6 +247,7 @@
         self.keytype = keytype
         self.valuetype = valuetype
         self.handler = None
+        self.description = None
         self.registry = registry
         self._children = []    # [(key, info), ...]
         self._attrmap = {}     # {attribute: info, ...}


=== Zope3/src/ZConfig/matcher.py 1.12 => 1.12.10.1 ===
--- Zope3/src/ZConfig/matcher.py:1.12	Thu May  1 15:34:57 2003
+++ Zope3/src/ZConfig/matcher.py	Sun Jun 22 10:22:21 2003
@@ -134,6 +134,10 @@
         object."""
         values = self._values
         for key, ci in self.type:
+            if key:
+                key = repr(key)
+            else:
+                key = "section type " + `ci.sectiontype.name`
             assert ci.attribute is not None
             attr = ci.attribute
             v = values[attr]
@@ -146,12 +150,8 @@
             if v is None and ci.minOccurs:
                 default = ci.getdefault()
                 if default is None:
-                    if key:
-                        s = `key`
-                    else:
-                        s = "section type " + `ci.sectiontype.name`
                     raise ZConfig.ConfigurationError(
-                        "no values for %s; %s required" % (s, ci.minOccurs))
+                        "no values for %s; %s required" % (key, ci.minOccurs))
                 else:
                     v = values[attr] = default[:]
             if ci.ismulti():
@@ -160,7 +160,7 @@
                 if len(v) < ci.minOccurs:
                     raise ZConfig.ConfigurationError(
                         "not enough values for %s; %d found, %d required"
-                        % (`key`, len(v), ci.minOccurs))
+                        % (key, len(v), ci.minOccurs))
             if v is None and not ci.issection():
                 if ci.ismulti():
                     v = ci.getdefault()[:]