[Zope3-checkins] CVS: Zope3/src/zope/app/browser/services/utility - useconfiguration.py:1.11

[Steve Alexander]

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

Modified Files:
	useconfiguration.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/utility/useconfiguration.py 1.10 => 1.11 ===
--- Zope3/src/zope/app/browser/services/utility/useconfiguration.py:1.10	Fri Jun  6 12:01:30 2003
+++ Zope3/src/zope/app/browser/services/utility/useconfiguration.py	Fri Jun 13 13:41:14 2003
@@ -22,7 +22,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
 from zope.component import getServiceManager, getView, getAdapter
 from zope.interface import providedBy
 from zope.proxy import removeAllProxies
@@ -149,14 +149,14 @@
                 services[path] = obj
                 conf.status = Unregistered
                 parent = getParent(conf)
-                name = objectName(conf)
+                name = getName(conf)
                 container = getAdapter(parent, IZopeContainer)
                 del container[name]
 
         # 2) Delete the service objects
         for path, obj in services.items():
             parent = getParent(obj)
-            name = objectName(obj)
+            name = getName(obj)
             container = getAdapter(parent, IZopeContainer)
             del container[name]