[Zope3-checkins] CVS: Zope3/src/zope/context - __init__.py:1.20 interfaces.py:1.14

[Steve Alexander]

Update of /cvs-repository/Zope3/src/zope/context
In directory cvs.zope.org:/tmp/cvs-serv27748/src/zope/context

Modified Files:
	__init__.py interfaces.py 
Log Message:
Removed the ContextAware mixin marker class.
It's a good idea, but should be implemented as a metaclass that makes
appropriate descriptors into contextdescriptors. That way, its actions
will be more predictable, and the C code to Wrapper can be simpler, and
needn't grow special cases.


=== Zope3/src/zope/context/__init__.py 1.19 => 1.20 ===
--- Zope3/src/zope/context/__init__.py:1.19	Sun Jun  1 11:59:40 2003
+++ Zope3/src/zope/context/__init__.py	Sat Jun  7 09:00:01 2003
@@ -26,9 +26,8 @@
 from zope.context.wrapper import getdict, getdictcreate
 from zope.context.wrapper import getcontext, getinnercontext
 from zope.context.wrapper import getinnerwrapper, getbaseobject
-from zope.context.wrapper import ContextDescriptor, ContextAware
-from zope.context.wrapper import ContextMethod, ContextProperty
-from zope.context.wrapper import Wrapper
+from zope.context.wrapper import ContextDescriptor, ContextMethod
+from zope.context.wrapper import ContextProperty, Wrapper
 from zope.proxy import queryProxy, queryInnerProxy, isProxy, getProxiedObject
 from zope.context.interfaces import IWrapperIntrospection
 
@@ -54,7 +53,6 @@
     else:
         return None
 
-
 def getWrapperContainer(_ob):
     wrapper = queryInnerProxy(_ob, Wrapper)
     if wrapper is not None:
@@ -71,7 +69,6 @@
 
 def isWrapper(_ob):
     return isProxy(_ob, Wrapper)
-
 
 def ContainmentIterator(obj):
     wrapper = queryInnerProxy(obj, Wrapper)


=== Zope3/src/zope/context/interfaces.py 1.13 => 1.14 ===
--- Zope3/src/zope/context/interfaces.py:1.13	Mon Jun  2 14:38:40 2003
+++ Zope3/src/zope/context/interfaces.py	Sat Jun  7 09:00:01 2003
@@ -94,9 +94,9 @@
     It provides a place to keep the object's context, in the form of
     a reference to its context object, and a dictionary of contextual metadata.
 
-    If the wrapped object's class derives from ContextAware, or a descriptor
-    on the wrapped object's class is a ContextDescriptor, then the 'self'
-    of the method will be rebound to be the wrapper rather than the object.
+    If a descriptor on the wrapped object's class is a ContextDescriptor,
+    then the 'self' of the method will be rebound to be the wrapper rather
+    than the object.
     Rebinding does not work at all if the wrapped object is a Classic Class
     instance.
     Such rebinding is supported for ordinary descriptors, but only for