[Zope3-checkins] CVS: Zope3/src/zope/app/ftp - __init__.py:1.4.26.2

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/ftp
In directory cvs.zope.org:/tmp/cvs-serv13470/src/zope/app/ftp

Modified Files:
      Tag: parentgeddon-branch
	__init__.py 
Log Message:
Can't have the tests passing, can we?

=== Zope3/src/zope/app/ftp/__init__.py 1.4.26.1 => 1.4.26.2 ===
--- Zope3/src/zope/app/ftp/__init__.py:1.4.26.1	Mon Sep  8 14:21:38 2003
+++ Zope3/src/zope/app/ftp/__init__.py	Fri Sep 12 15:15:26 2003
@@ -27,7 +27,6 @@
 from zope.app.event.objectevent import ObjectCreatedEvent
 
 from zope.app.interfaces.dublincore import IZopeDublinCore
-from zope.app.interfaces.container import IAddTarget, IRemoveSource
 
 from zope.proxy import removeAllProxies
 
@@ -82,7 +81,7 @@
             info['type'] = 'd'
             info['group_readable'] = hasattr(f, 'get')
             f = queryAdapter(file, IWriteDirectory)
-            info['group_writable'] = hasattr(f, 'setObject')
+            info['group_writable'] = hasattr(f, '__setitem__')
         else:
             # It's a file
             info['type'] = 'f'
@@ -140,17 +139,14 @@
 
     def mkdir(self, name):
         dir = queryAdapter(self.context, IWriteDirectory)
-        dir = getAdapter(dir, IAddTarget)
-
         factory = getAdapter(self.context, IDirectoryFactory)
         newdir = factory(name)
         publish(self.context, ObjectCreatedEvent(newdir))
-        dir.addObject(name, newdir)
+        dir[name] = newdir
 
     def remove(self, name):
         dir = queryAdapter(self.context, IWriteDirectory)
-        dir = getAdapter(dir, IRemoveSource)
-        dir.removeObject(name)
+        del dir[name]
 
     def rmdir(self, name):
         self.remove(name)
@@ -208,7 +204,6 @@
             ext = "."
 
         dir = queryAdapter(self.context, IWriteDirectory)
-        dir = getAdapter(dir, IAddTarget)
 
         factory = queryNamedAdapter(self.context, IFileFactory, ext)
         if factory is None:
@@ -216,13 +211,13 @@
 
         newfile = factory(name, '', data)
         publish(self.context, ObjectCreatedEvent(newfile))
-        dir.addObject(name, newfile)
+        dir[name] = newfile
 
     def writable(self, name):
         if name in self._dir:
             f = queryAdapter(self._dir[name], IWriteFile)
             return hasattr(f, 'write')
         d = queryAdapter(self.context, IWriteDirectory)
-        return hasattr(d, 'setObject')
+        return hasattr(d, '__setitem__')