[Zope3-checkins] CVS: Zope3/src/zope/app/container - copy.py:1.1.2.5

Sidnei da Silva sidnei@x3ng.com.br
Tue, 4 Feb 2003 12:06:55 -0500


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

Modified Files:
      Tag: paris-copypasterename-branch
	copy.py 
Log Message:
Fourth stab at getting tests right. We are a little closer now.

=== Zope3/src/zope/app/container/copy.py 1.1.2.4 => 1.1.2.5 ===
--- Zope3/src/zope/app/container/copy.py:1.1.2.4	Tue Feb  4 11:02:16 2003
+++ Zope3/src/zope/app/container/copy.py	Tue Feb  4 12:06:23 2003
@@ -22,6 +22,7 @@
 from zope.app.event.objectevent import ObjectModifiedEvent
 from zope.proxy.context import ContextWrapper
 from zope.app.event import publish
+from types import StringTypes
 
 class PasteTarget:
 
@@ -69,10 +70,10 @@
 
         # We remove the proxies from the object before adding it to
         # the container, because we can't store proxies.
-        object = removeAllProxies(object)
+        obj = removeAllProxies(obj)
 
         # Add the object
-        key = container.setObject(key, object)
+        key = container.setObject(key, obj)
 
         # we dont publish the added event here
         # and dont call the after add hook
@@ -96,7 +97,7 @@
         container.
         '''
         container = self.context
-
+ 
         object = container[key]
         object = ContextWrapper(object, container, name=key)