[Zope3-checkins] CVS: Zope3/src/zope/app/container - copypastemove.py:1.7 dependency.py:1.6 directory.py:1.4 zopecontainer.py:1.17

[Jim Fulton]

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

Modified Files:
	copypastemove.py dependency.py directory.py zopecontainer.py 
Log Message:
Deprecated zope.proxy.introspection. Just use zope.proxy.


=== Zope3/src/zope/app/container/copypastemove.py 1.6 => 1.7 ===
--- Zope3/src/zope/app/container/copypastemove.py:1.6	Tue May 27 10:18:13 2003
+++ Zope3/src/zope/app/container/copypastemove.py	Wed May 28 11:46:06 2003
@@ -17,20 +17,19 @@
 $Id$
 """
 
-from zope.app.interfaces.container import IOptionalNamesContainer
+from types import StringTypes
+from zope.app.event import publish
+from zope.app.event.objectevent import ObjectModifiedEvent
 from zope.app.interfaces.container import IContainerNamesContainer
-from zope.app.interfaces.container import IMoveSource
 from zope.app.interfaces.container import ICopySource, INoChildrenCopySource
-from zope.app.interfaces.container import IPasteTarget
+from zope.app.interfaces.container import IMoveSource
+from zope.app.interfaces.container import IOptionalNamesContainer
 from zope.app.interfaces.container import IPasteNamesChooser
+from zope.app.interfaces.container import IPasteTarget
 from zope.app.interfaces.content.folder import ICloneWithoutChildren
 from zope.component import getAdapter
-from zope.proxy.introspection import removeAllProxies
-from zope.app.event.objectevent import ObjectModifiedEvent
 from zope.context import ContextWrapper
-from zope.app.event import publish
-from zope.proxy.introspection import removeAllProxies
-from types import StringTypes
+from zope.proxy import removeAllProxies
 import copy
 
 class PasteTarget:


=== Zope3/src/zope/app/container/dependency.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/container/dependency.py:1.5	Fri Mar 21 10:29:07 2003
+++ Zope3/src/zope/app/container/dependency.py	Wed May 28 11:46:06 2003
@@ -19,7 +19,7 @@
 from zope.app.interfaces.dependable import IDependable
 from zope.app.interfaces.dependable import DependencyError
 from zope.app.interfaces.event import ISubscriber
-from zope.proxy.introspection import removeAllProxies
+from zope.proxy import removeAllProxies
 from zope.app.traversing import getPath, canonicalPath
 
 class DependencyChecker:


=== Zope3/src/zope/app/container/directory.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/container/directory.py:1.3	Mon Mar 31 12:13:07 2003
+++ Zope3/src/zope/app/container/directory.py	Wed May 28 11:46:06 2003
@@ -26,7 +26,7 @@
 __metaclass__ = type
 
 import zope.app.interfaces.file
-from zope.proxy.introspection import removeAllProxies
+from zope.proxy import removeAllProxies
 
 def noop(container):
     """XXX adapt an IContainer to an IWriteDirectory by just returning it


=== Zope3/src/zope/app/container/zopecontainer.py 1.16 => 1.17 ===
--- Zope3/src/zope/app/container/zopecontainer.py:1.16	Tue May 27 10:18:13 2003
+++ Zope3/src/zope/app/container/zopecontainer.py	Wed May 28 11:46:06 2003
@@ -27,7 +27,7 @@
 from zope.app.interfaces.container import IDeleteNotifiable
 from zope.app.interfaces.copypastemove import IObjectMover
 from types import StringTypes
-from zope.proxy.introspection import removeAllProxies
+from zope.proxy import removeAllProxies
 from zope.exceptions import NotFoundError, DuplicationError
 from zope.app.event.objectevent \
      import ObjectRemovedEvent, ObjectModifiedEvent, ObjectAddedEvent