[Zope-CVS] CVS: Products/Ape/lib/apelib/fs - base.py:1.5.2.2 classification.py:1.3.2.1

[Shane Hathaway]

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

Modified Files:
      Tag: ape-0_8-branch
	base.py classification.py 
Log Message:
Continued refactoring and renaming.

Over 60 tests now pass.


=== Products/Ape/lib/apelib/fs/base.py 1.5.2.1 => 1.5.2.2 ===
--- Products/Ape/lib/apelib/fs/base.py:1.5.2.1	Fri Dec 19 21:52:48 2003
+++ Products/Ape/lib/apelib/fs/base.py	Sat Dec 20 02:31:05 2003
@@ -27,11 +27,8 @@
     def __init__(self, conn_name='fs'):
         self.conn_name = conn_name
 
-    def getSchema(self):
-        return self.schema
-
     def getConnection(self, event):
-        return event.getConnection(self.conn_name)
+        return event.connections[self.conn_name]
 
     def getPollSources(self, event):
         return None


=== Products/Ape/lib/apelib/fs/classification.py 1.3 => 1.3.2.1 ===
--- Products/Ape/lib/apelib/fs/classification.py:1.3	Wed Jul 30 17:33:02 2003
+++ Products/Ape/lib/apelib/fs/classification.py	Sat Dec 20 02:31:05 2003
@@ -31,7 +31,7 @@
 
     def load(self, event):
         fs_conn = self.getConnection(event)
-        p = event.getKey()
+        p = event.oid
         classification = {'node_type': fs_conn.readNodeType(p)}
         text = fs_conn.readSection(p, 'classification', '')
         if text:
@@ -46,7 +46,7 @@
     def store(self, event, state):
         # state is a classification
         fs_conn = self.getConnection(event)
-        p = event.getKey()
+        p = event.oid
         items = state.items()
         items.sort()
         text = []