[Zope3-checkins] CVS: Zope3/src/zope/app - copypastemove.py:1.3

[Albertas Agejevas]

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

Modified Files:
	copypastemove.py 
Log Message:
Renamed getPgysicalPathString() to getPath().

Got rid of getPhysicalPath() (which used to return a tuple) by replacing it
by getPath().


=== Zope3/src/zope/app/copypastemove.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/copypastemove.py:1.2	Wed Feb 26 11:11:35 2003
+++ Zope3/src/zope/app/copypastemove.py	Wed Mar 19 14:57:21 2003
@@ -44,7 +44,7 @@
 
     def moveTo(self, target, name=None):
         '''Move this object to the target given.
-        
+
         Returns the new name within the target
         Typically, the target is adapted to IPasteTarget.'''
 
@@ -53,14 +53,14 @@
         orig_name = objectName(obj)
         if name is None:
             name = objectName(obj)
-        
+
         movesource = getAdapter(container, IMoveSource)
         physicaltarget = getAdapter(target, IPhysicallyLocatable)
-        target_path = physicaltarget.getPhysicalPath()
+        target_path = physicaltarget.getPath()
 
         physicalsource = getAdapter(container, IPhysicallyLocatable)
-        source_path = physicalsource.getPhysicalPath()
-        
+        source_path = physicalsource.getPath()
+
         if queryAdapter(obj, IMoveNotifiable):
             getAdapter(obj, IMoveNotifiable).beforeDeleteHook(obj, container, \
                                     movingTo=target_path)
@@ -83,7 +83,7 @@
         publish(container, ObjectMovedEvent(container, source_path, target_path))
 
         return new_name
-        
+
     def moveable(self):
         '''Returns True if the object is moveable, otherwise False.'''
         return True
@@ -99,7 +99,7 @@
             name = objectName(obj)
         pastetarget = getAdapter(target, IPasteTarget)
         return pastetarget.acceptsObject(name, obj)
-    
+
 class ObjectCopier:
 
     __implements__ = IObjectCopier
@@ -122,13 +122,13 @@
         container = getParent(obj)
         if name is None:
             name = objectName(obj)
-        
+
         physicaltarget = getAdapter(target, IPhysicallyLocatable)
-        target_path = physicaltarget.getPhysicalPath()
+        target_path = physicaltarget.getPath()
 
         physicalsource = getAdapter(container, IPhysicallyLocatable)
-        source_path = physicalsource.getPhysicalPath()
-        
+        source_path = physicalsource.getPath()
+
         copysource = getAdapter(container, ICopySource)
         obj = copysource.copyObject(name, target_path)
 
@@ -154,7 +154,7 @@
 
     def copyableTo(self, target, name=None):
         '''Say whether the object can be copied to the given target.
-        
+
         Returns True if it can be copied there. Otherwise, returns
         False.
         '''
@@ -190,4 +190,4 @@
     def getContents(self):
         '''Return the contents of the clipboard'''
         return removeAllProxies(self.context.get('clipboard', ()))
-    
+