[Zope3-checkins] CVS: Zope3/src/zope/app/browser/services - cache.py:1.10 connection.py:1.12 service.py:1.29 view.py:1.19

[Steve Alexander]

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

Modified Files:
	cache.py connection.py service.py view.py 
Log Message:
Removed the @@object_name view, as used in some page templates, and
the ObjectName view and adapter also.
Extended IPhysicallyLocatable with a getName method.
Renamed the convenience function objectName to getName.

If you have page templates that use @@object_name, then you can replace it
with zope:name.



=== Zope3/src/zope/app/browser/services/cache.py 1.9 => 1.10 ===
--- Zope3/src/zope/app/browser/services/cache.py:1.9	Thu May  1 12:28:28 2003
+++ Zope3/src/zope/app/browser/services/cache.py	Fri Jun 13 13:41:13 2003
@@ -23,7 +23,7 @@
 from zope.publisher.browser import BrowserView
 from zope.app.interfaces.services.configuration \
      import Unregistered, Registered, Active
-from zope.app.traversing import traverse, getPath, getParent, objectName
+from zope.app.traversing import traverse, getPath, getParent, getName
 
 class Caches(BrowserView):
 
@@ -103,14 +103,14 @@
                 caches[path] = obj
                 conf.status = Unregistered
                 parent = getParent(conf)
-                name = objectName(conf)
+                name = getName(conf)
                 container = getAdapter(parent, IZopeContainer)
                 del container[name]
 
         # 2) Delete the cache objects
         for path, obj in caches.items():
             parent = getParent(obj)
-            name = objectName(obj)
+            name = getName(obj)
             container = getAdapter(parent, IZopeContainer)
             del container[name]
 


=== Zope3/src/zope/app/browser/services/connection.py 1.11 => 1.12 ===
--- Zope3/src/zope/app/browser/services/connection.py:1.11	Thu May  1 12:28:28 2003
+++ Zope3/src/zope/app/browser/services/connection.py	Fri Jun 13 13:41:13 2003
@@ -23,7 +23,7 @@
 from zope.publisher.browser import BrowserView
 from zope.app.interfaces.services.configuration \
      import Unregistered, Registered, Active
-from zope.app.traversing import traverse, getPath, getParent, objectName
+from zope.app.traversing import traverse, getPath, getParent, getName
 
 class Connections(BrowserView):
 
@@ -103,14 +103,14 @@
                 connections[path] = obj
                 conf.status = Unregistered
                 parent = getParent(conf)
-                name = objectName(conf)
+                name = getName(conf)
                 container = getAdapter(parent, IZopeContainer)
                 del container[name]
 
         # 2) Delete the connection objects
         for path, obj in connections.items():
             parent = getParent(obj)
-            name = objectName(obj)
+            name = getName(obj)
             container = getAdapter(parent, IZopeContainer)
             del container[name]
 


=== Zope3/src/zope/app/browser/services/service.py 1.28 => 1.29 ===
--- Zope3/src/zope/app/browser/services/service.py:1.28	Thu Jun 12 13:03:42 2003
+++ Zope3/src/zope/app/browser/services/service.py	Fri Jun 13 13:41:13 2003
@@ -132,7 +132,7 @@
         return lst
 
     def action(self, name=[], active=[]):
-        path = zapi.objectName(self.context)
+        path = zapi.name(self.context)
         configure = zapi.getWrapperContainer(
             self.context).getConfigurationManager()
         container = zapi.getAdapter(configure, IZopeContainer)
@@ -226,7 +226,7 @@
                 services[path] = obj
                 conf.status = Unregistered
                 parent = zapi.getParent(conf)
-                name = zapi.objectName(conf)
+                name = zapi.name(conf)
                 container = zapi.getAdapter(parent, IZopeContainer)
                 del container[name]
 
@@ -240,7 +240,7 @@
         #     manipulate the folder explicitly.
         for path, obj in services.items():
             parent = zapi.getParent(obj)
-            name = zapi.objectName(obj)
+            name = zapi.name(obj)
             container = zapi.getAdapter(parent, IZopeContainer)
             del container[name]
 


=== Zope3/src/zope/app/browser/services/view.py 1.18 => 1.19 ===
--- Zope3/src/zope/app/browser/services/view.py:1.18	Tue Jun  3 18:46:16 2003
+++ Zope3/src/zope/app/browser/services/view.py	Fri Jun 13 13:41:13 2003
@@ -31,7 +31,7 @@
 from zope.app.interfaces.container import IZopeContainer
 from zope.app.interfaces.services.configuration import \
      Unregistered, Registered, Active
-from zope.app.traversing import getPath, getParent, objectName
+from zope.app.traversing import getPath, getParent, getName
 
 class IViewSearch(Interface):
 
@@ -166,7 +166,7 @@
                 conf = info['configuration']
                 conf.status = Unregistered
                 parent = getParent(conf)
-                name = objectName(conf)
+                name = getName(conf)
                 container = getAdapter(parent, IZopeContainer)
                 del container[name]