[Zope3-checkins] CVS: Zope3/src/zope/app - copypastemove.py:1.10.24.2 decorator.py:1.1.2.2 location.py:1.1.2.2

[Jim Fulton]

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

Modified Files:
      Tag: parentgeddon-branch
	copypastemove.py decorator.py location.py 
Log Message:
got more tests to pass on branch

=== Zope3/src/zope/app/copypastemove.py 1.10.24.1 => 1.10.24.2 ===
--- Zope3/src/zope/app/copypastemove.py:1.10.24.1	Mon Sep  8 14:21:18 2003
+++ Zope3/src/zope/app/copypastemove.py	Tue Sep  9 14:08:17 2003
@@ -250,7 +250,7 @@
 def rename(container, oldid, newid):
     object = container.get(oldid)
     if object is None:
-        raise NotFoundError(self, oldid)
+        raise NotFoundError(container, oldid)
     mover = zapi.getAdapter(object, IObjectMover)
 
     if newid in container:


=== Zope3/src/zope/app/decorator.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/decorator.py:1.1.2.1	Mon Sep  8 14:21:18 2003
+++ Zope3/src/zope/app/decorator.py	Tue Sep  9 14:08:17 2003
@@ -22,6 +22,8 @@
 from zope.security.checker import selectChecker, CombinedChecker
 from zope.interface.declarations import ObjectSpecificationDescriptor
 from zope.interface.declarations import getObjectSpecification
+from zope.interface.declarations import ObjectSpecification
+from zope.interface import providedBy
 
 class DecoratorSpecificationDescriptor(ObjectSpecificationDescriptor):
     """Support for interface declarations on decorators
@@ -76,7 +78,7 @@
             return ObjectSpecification(provided, cls)
 
 
-class DecoratedSecurityCheckerDescriptor:
+class DecoratedSecurityCheckerDescriptor(object):
     """Descriptor for a Decorator that provides a decorated security checker.
     """
     def __get__(self, inst, cls=None):


=== Zope3/src/zope/app/location.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/location.py:1.1.2.1	Mon Sep  8 14:21:18 2003
+++ Zope3/src/zope/app/location.py	Tue Sep  9 14:08:17 2003
@@ -15,7 +15,7 @@
 
 $Id$
 """
-
+from __future__ import generators
 import zope.interface
 from zope.app import zapi
 from zope.app.interfaces.location import ILocation
@@ -34,6 +34,10 @@
 
     __parent__ = __name__ = None
 
+def LocationIterator(object):
+    while object is not None:
+        yield object
+        object = object.__parent__
 
 class LocationPhysicallyLocatable:
     """Provide location information for location objects