[Zope-Checkins] CVS: Packages/ZConfig - datatypes.py:1.1.2.22 schema.py:1.1.2.36

[Fred L. Drake, Jr.]

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

Modified Files:
      Tag: zconfig-schema-devel-branch
	datatypes.py schema.py 
Log Message:
Rename the "str" datatype to "string", to be more consistent with the
"boolean" and "integer" types.


=== Packages/ZConfig/datatypes.py 1.1.2.21 => 1.1.2.22 ===
--- Packages/ZConfig/datatypes.py:1.1.2.21	Wed Dec 25 18:04:12 2002
+++ Packages/ZConfig/datatypes.py	Fri Jan  3 01:04:25 2003
@@ -281,7 +281,7 @@
     "identifier":    IdentifierConversion().__call__,
     "integer":       integer,
     "float":         float_conversion,
-    "str":           str,
+    "string":        str,
     "null":          null_conversion,
     "locale":        MemoizedConversion(check_locale).__call__,
     "port-number":   port_number,


=== Packages/ZConfig/schema.py 1.1.2.35 => 1.1.2.36 ===
--- Packages/ZConfig/schema.py:1.1.2.35	Fri Jan  3 00:50:40 2003
+++ Packages/ZConfig/schema.py	Fri Jan  3 01:04:25 2003
@@ -92,7 +92,7 @@
             self._cdata.append(data)
         elif data.strip():
             self.error("unexpected non-blank character data: "
-                               + data.strip())
+                       + `data.strip()`)
 
     def endElement(self, name):
         if name in self._handled_tags:
@@ -168,7 +168,7 @@
 
     def get_sect_typeinfo(self, attrs):
         keytype = self.get_datatype(attrs, "keytype", "basic-key")
-        valuetype = self.get_datatype(attrs, "valuetype", "str")
+        valuetype = self.get_datatype(attrs, "valuetype", "string")
         datatype = self.get_datatype(attrs, "datatype", "null")
         return keytype, valuetype, datatype
 
@@ -284,7 +284,7 @@
             self.error(element + " may not specify '*' for name")
         if not name and any != '+':
             self.error(element + " name may not be omitted or empty")
-        datatype = self.get_datatype(attrs, "datatype", "str")
+        datatype = self.get_datatype(attrs, "datatype", "string")
         handler = self.get_handler(attrs)
         return name or any, datatype, handler, attribute