[Zope3-checkins] SVN: Zope3/branches/ZopeX3-3.0/src/zope/app/ Backport 2 Bug fixes. Fixes Issue 210.

Stephan Richter srichter at cosmos.phy.tufts.edu
Fri Jul 2 12:36:19 EDT 2004


Log message for revision 26047:
Backport 2 Bug fixes. Fixes Issue 210.



-=-
Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/ftp/__init__.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/ftp/__init__.py	2004-07-02 16:27:10 UTC (rev 26046)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/ftp/__init__.py	2004-07-02 16:36:19 UTC (rev 26047)
@@ -16,8 +16,6 @@
 
 $Id$
 """
-__metaclass__ = type
-
 from zope.interface import implements
 from zope.component import queryAdapter
 from zope.proxy import removeAllProxies
@@ -34,7 +32,7 @@
 from zope.app.dublincore.interfaces import IZopeDublinCore
 from zope.app.copypastemove import rename
 
-class FTPView:
+class FTPView(object):
     implements(IFTPPublisher)
 
     def __init__(self, context, request):
@@ -120,7 +118,7 @@
         return self._lsinfo(name, self._dir[name])
 
     def _mtime(self, file):
-        dc = IZopeDublinCore(file)
+        dc = IZopeDublinCore(file, None)
         if dc is not None:
             return dc.modified
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/security/_protections.zcml
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/security/_protections.zcml	2004-07-02 16:27:10 UTC (rev 26046)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/security/_protections.zcml	2004-07-02 16:36:19 UTC (rev 26047)
@@ -20,7 +20,7 @@
                       keys maxKey minKey" /> 
 </content>
 <content class="BTrees.IIBTree.IITreeIterator">
-   <allow attributes="__iter__ __str__ __getitem__ __len__ __contains__" /> 
+   <allow attributes="__iter__ __str__ __getitem__ __len__ __contains__ next" /> 
 </content>
 
 <!-- ===================================================================== -->
@@ -40,7 +40,7 @@
                       keys maxKey minKey" /> 
 </content>
 <content class="BTrees.IOBTree.IOTreeIterator">
-   <allow attributes="__iter__ __str__ __getitem__ __len__ __contains__" /> 
+   <allow attributes="__iter__ __str__ __getitem__ __len__ __contains__ next" /> 
 </content>
 
 <!-- ===================================================================== -->
@@ -60,7 +60,7 @@
                       keys maxKey minKey" /> 
 </content>
 <content class="BTrees.OIBTree.OITreeIterator">
-   <allow attributes="__iter__ __str__ __getitem__ __len__ __contains__" /> 
+   <allow attributes="__iter__ __str__ __getitem__ __len__ __contains__ next" /> 
 </content>
 
 <!-- ===================================================================== -->
@@ -80,7 +80,7 @@
                       keys maxKey minKey" /> 
 </content>
 <content class="BTrees.OOBTree.OOTreeIterator">
-   <allow attributes="__iter__ __str__ __getitem__ __len__ __contains__" /> 
+   <allow attributes="__iter__ __str__ __getitem__ __len__ __contains__ next" /> 
 </content>
 
 <!-- ===================================================================== -->



More information about the Zope3-Checkins mailing list