[Zope-Checkins] CVS: Zope3/lib/python/Zope/ContextWrapper - IWrapper.py:1.1.2.1

[Martijn Pieters]

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

Modified Files:
      Tag: Zope-3x-branch
	IWrapper.py 
Log Message:
Update IWrapperFuncs interface to reflect reality.


=== Zope3/lib/python/Zope/ContextWrapper/IWrapper.py 1.1 => 1.1.2.1 ===
     def Wrapper(object, context=None):
         """
-        Create and return a new context wrapper for object. If context is
-        given and not None, context will be the context object. Wrapper can
-        be subclassed.
+        Create and return a new context wrapper for object. If context is given
+        and not None, context will be the context object. Wrapper can be
+        subclassed.
         """
     def getobject(obj):
         """
         Return the wrapped object. If obj is not a wrapper object, return obj.
         """
-    def getinnerobject(obj):
+    def getinnerwrapper(obj):
         """
-        Return the innermost wrapped object in a chain of wrappers with obj
-        at the head. If obj is not a wrapper object, just return obj.
+        Return the innermost wrapper in a chain of wrappers with obj at the
+        head. If obj is wrapped, just return obj.
         """
     def getinnercontext(obj):
         """
-        Return the context object from the innermost wrapper in a chain
-        with obj at the head. If the innermost wrapper has not context
-        object, return None. If obj is not a wrapper object, just return obj.
+        Return the context object from the innermost wrapper in a chain with
+        obj at the head. If the innermost wrapper has not context object,
+        return None. If obj is not a wrapper object, just return obj.
         """
     def getcontext(obj):
         """
@@ -30,8 +30,8 @@
         """
     def getdict(obj):
         """
-        Return the context dictionary if there is one, or None. If obj is
-        not a wrapper instance, return None.
+        Return the context dictionary if there is one, or None. If obj is not a
+        wrapper instance, return None.
         """
     def getdictcreate(wrapper):
         """
@@ -40,13 +40,13 @@
         """
     def setobject(wrapper, object):
         """
-        Replace the wrapped object with object. Raises TypeError if wrapper
-        is not a wrapper object.
+        Replace the wrapped object with object. Raises TypeError if wrapper is
+        not a wrapper object.
         """
     def setcontext(wrapper, context):
         """
-        Replace the context object with context. If context is None, it will
-        be represented as NULL in C API. Raises TypeError if wrapper is not
+        Replace the context object with context. If context is None, it will be
+        represented as NULL in C API. Raises TypeError if wrapper is not
         a wrapper object.
         """