[Zope-CVS] CVS: Products/Ape/lib/apelib/fs - properties.py:1.2.2.1 structure.py:1.2.2.2

[Shane Hathaway]

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

Modified Files:
      Tag: ape-newconf-branch
	properties.py structure.py 
Log Message:
Implemented XML-based configuration.  The filesystem tests pass.

Used an experimental approach for mixing configuration from multiple sources.
Take a look at zope2/apeconf.xml.


=== Products/Ape/lib/apelib/fs/properties.py 1.2 => 1.2.2.1 ===
--- Products/Ape/lib/apelib/fs/properties.py:1.2	Tue Apr 29 18:11:50 2003
+++ Products/Ape/lib/apelib/fs/properties.py	Mon Jul  7 18:59:24 2003
@@ -68,7 +68,7 @@
     schema.addField('data', 'string')
 
     def __init__(self, section='properties', conn_name='fs'):
-        self.section = section
+        self.section = str(section)
         FSGatewayBase.__init__(self, conn_name)
 
     def load(self, event):
@@ -111,7 +111,7 @@
     schema = FieldSchema('data', 'string')
 
     def __init__(self, section, conn_name='fs'):
-        self.section = section
+        self.section = str(section)
         FSGatewayBase.__init__(self, conn_name)
 
     def load(self, event):


=== Products/Ape/lib/apelib/fs/structure.py 1.2.2.1 => 1.2.2.2 ===
--- Products/Ape/lib/apelib/fs/structure.py:1.2.2.1	Tue Jun 24 17:38:43 2003
+++ Products/Ape/lib/apelib/fs/structure.py	Mon Jul  7 18:59:24 2003
@@ -33,6 +33,10 @@
     schema = FieldSchema('data', 'string')
 
     def __init__(self, text=0, conn_name='fs'):
+        if text == 'text':
+            text = 1
+        elif text == 'binary':
+            text = 0
         self.text = text
         FSGatewayBase.__init__(self, conn_name)
 
@@ -51,7 +55,6 @@
         c.writeNodeType(p, 'f')
         c.writeData(p, state, as_text=self.text)
         return state
-
 
 
 class FSAutoId (FSGatewayBase):