[Zope-CVS] CVS: Products/Ape/lib/apelib/zope2 - ofsserial.py:1.14 scripts.py:1.6

[Shane Hathaway]

Update of /cvs-repository/Products/Ape/lib/apelib/zope2
In directory cvs.zope.org:/tmp/cvs-serv1879/lib/apelib/zope2

Modified Files:
	ofsserial.py scripts.py 
Log Message:
Merged sql-types-branch.


=== Products/Ape/lib/apelib/zope2/ofsserial.py 1.13 => 1.14 ===
--- Products/Ape/lib/apelib/zope2/ofsserial.py:1.13	Fri Mar 26 10:52:49 2004
+++ Products/Ape/lib/apelib/zope2/ofsserial.py	Wed Jul 21 02:38:05 2004
@@ -26,7 +26,7 @@
 from OFS.PropertyManager import PropertyManager
 
 from apelib.core.interfaces import ISerializer, SerializationError
-from apelib.core.schemas import FieldSchema, RowSequenceSchema
+from apelib.core.schemas import ColumnSchema, RowSequenceSchema
 from apelib.core.serializers import OptionalSerializer
 from apelib.zodb3.serializers import find_unmanaged
 
@@ -50,7 +50,7 @@
 
     __implements__ = ISerializer
 
-    schema = FieldSchema('data', 'string')
+    schema = ColumnSchema('data', 'string')
 
     def can_serialize(self, object):
         return isinstance(object, File)
@@ -145,7 +145,7 @@
 
     __implements__ = ISerializer
 
-    schema = FieldSchema('id', 'string')
+    schema = ColumnSchema('id', 'string')
 
     def can_serialize(self, obj):
         return 1


=== Products/Ape/lib/apelib/zope2/scripts.py 1.5 => 1.6 ===
--- Products/Ape/lib/apelib/zope2/scripts.py:1.5	Sat Mar 20 01:34:25 2004
+++ Products/Ape/lib/apelib/zope2/scripts.py	Wed Jul 21 02:38:05 2004
@@ -28,7 +28,7 @@
     Bucket = lambda: {}
 
 from apelib.core.interfaces import ISerializer
-from apelib.core.schemas import FieldSchema, RowSequenceSchema
+from apelib.core.schemas import ColumnSchema, RowSequenceSchema
 
 
 class PythonScriptSerializer:
@@ -41,7 +41,7 @@
 
     __implements__ = ISerializer
 
-    schema = FieldSchema('data', 'string')
+    schema = ColumnSchema('data', 'string')
 
     def can_serialize(self, obj):
         return isinstance(obj, PythonScript)
@@ -83,7 +83,7 @@
 
     __implements__ = ISerializer
 
-    schema = FieldSchema('data', 'string')
+    schema = ColumnSchema('data', 'string')
 
     params_re = re.compile(r'\s*<params>(.*)</params>\s*\n', re.I | re.S)