[Zope-Checkins] CVS: Zope3/lib/python/Zope/ComponentArchitecture - IComponentArchitecture.py:1.1.2.7 __init__.py:1.1.6.7 hooks.py:1.1.2.11 metaConfigure.py:1.1.2.6

[Fred Drake Jr]

Update of /cvs-repository/Zope3/lib/python/Zope/ComponentArchitecture
In directory cvs.zope.org:/tmp/cvs-serv15563/Zope/ComponentArchitecture

Modified Files:
      Tag: Zope-3x-branch
	IComponentArchitecture.py __init__.py hooks.py 
	metaConfigure.py 
Log Message:
Presentation --> View

=== Zope3/lib/python/Zope/ComponentArchitecture/IComponentArchitecture.py 1.1.2.6 => 1.1.2.7 ===
         """
 
-    def providePresentation(forInterface, name, type, maker):
-        """Provide a presentation
+    def provideView(forInterface, name, type, maker):
+        """Provide a view
 
-        A presentation provides some type of presentation (e.g. browser, ftp)
+        A view provides some type of presentation (e.g. browser, ftp)
         for components of a given interface.
 
         Arguments:
 
-        forInterface -- The interface the presentation is for
+        forInterface -- The interface the view is for
 
-        name -- The presentation name
+        name -- The view name
 
-        type -- The presentation type, expressed as an interface
+        type -- The view type, expressed as an interface
 
-        maker -- a callable object that gets an presentation component for
+        maker -- a callable object that gets a view component for
         a context component.
         """
 
-    def getPresentation(object, name, type, default=None):
-        """Look up a named presentation of a given type for an object
+    def getView(object, name, type, default=None):
+        """Look up a named view of a given type for an object
 
         The type is expressed as an interface.
 
-        The object also provides a place to look for placeful presentations.
+        The object also provides a place to look for placeful views.
 
         A Zope.ComponentArchitecture.ComponentLookupError will be
         raised if the component can't be found.
@@ -85,7 +85,7 @@
     def createObject(object, name):
         """Create a new object using the factory with the given name
 
-        The object provides a place to look for placeful presentations.
+        The object provides a place to look for placeful views.
 
         A Zope.ComponentArchitecture.ComponentLookupError will be
         raised if the factory component can't be found.


=== Zope3/lib/python/Zope/ComponentArchitecture/__init__.py 1.1.6.6 => 1.1.6.7 ===
 from hooks import provideAdapter, getAdapter
 from hooks import provideUtility, getUtility
-from hooks import providePresentation, getPresentation
+from hooks import provideView, getView
 from hooks import provideFactory, createObject
 
 def _clear():


=== Zope3/lib/python/Zope/ComponentArchitecture/hooks.py 1.1.2.10 => 1.1.2.11 ===
     return r
 
-def providePresentation(forInterface, name, type, maker):
-    return providePresentation_hook(forInterface, name, type, maker)
+def provideView(forInterface, name, type, maker):
+    return provideView_hook(forInterface, name, type, maker)
 
-def getPresentation(object, name, type, default=_marker):
-    r = getPresentation_hook(object, name, type, default)
+def getView(object, name, type, default=_marker):
+    r = getView_hook(object, name, type, default)
     if r is _marker: raise ComponentLookupError(object, name, type)
     return r
 
@@ -63,17 +63,17 @@
     if c is None: return default
     return c
 
-def providePresentation_hook(forInterface, name, type, maker):
-    reg=_presentations.get(name, None)
+def provideView_hook(forInterface, name, type, maker):
+    reg = _views.get(name, None)
     if reg is None:
         reg=IToIRegistry()
-        _presentations[name]=reg
+        _views[name]=reg
     reg.register(forInterface, type, maker)
 
-def getPresentation_hook(object, name, type, default=None):
-    reg=_presentations.get(name, None)
+def getView_hook(object, name, type, default=None):
+    reg = _views.get(name, None)
     if reg is None: return default
-    c=reg.getForObject(object, type)
+    c = reg.getForObject(object, type)
     if c is None: return default
     return c(object)
 
@@ -92,11 +92,10 @@
     return factory()
 
 def _clear():
-    global _adapters, _utilities, _presentations, _factories
+    global _adapters, _utilities, _views, _factories
     _adapters = IToIRegistry()
     _utilities = IRegistry()
-    _presentations = {}
+    _views = {}
     _factories = {}
 
 _clear()
-


=== Zope3/lib/python/Zope/ComponentArchitecture/metaConfigure.py 1.1.2.5 => 1.1.2.6 ===
 # FOR A PARTICULAR PURPOSE.
 
-from hooks import provideAdapter, provideUtility, providePresentation
+from hooks import provideAdapter, provideUtility, provideView
 from Zope.Configuration.meta import register
 from Zope.Configuration.name import resolve
 from Zope.Configuration import namespace
@@ -17,19 +17,19 @@
 def provideUtilityDir(component, provides):
     provideUtility(resolve(provides), resolve(component))
 
-def providePresentationDir(component, type, name, for_=None):
+def provideViewDir(component, type, name, for_=None):
     if for_ is not None: for_ = resolve(for_)
-    providePresentation(for_, name, resolve(type), resolve(component))
+    provideView(for_, name, resolve(type), resolve(component))
 
-def provideDefaultPresentationDir(component, type, name, for_=None):
+def provideDefaultViewDir(component, type, name, for_=None):
     if for_ is not None: for_ = resolve(for_)
-    providePresentation(for_, name, resolve(type), resolve(component))
-    providePresentation(for_, "", resolve(type), resolve(component))
+    provideView(for_, name, resolve(type), resolve(component))
+    provideView(for_, "", resolve(type), resolve(component))
 
 def metaConfigure():
     register(namespace('zope'), 'adapter', provideAdapterDir)
     register(namespace('zope'), 'utility', provideUtilityDir)
-    register(namespace('zope'), 'presention', providePresentationDir)
-    register(namespace('zope'), 'defaultPresention',
-             provideDefaultPresentationDir)
+    register(namespace('zope'), 'presention', provideViewDir)
+    register(namespace('zope'), 'defaultView',
+             provideDefaultViewDir)