[Zope3-checkins] SVN: Zope3/branches/jim-adapter/src/zope/app/location/location.py Updated to reflect fix to zope.proxies. Now non-data descriptors are

[Jim Fulton]

Log message for revision 66295:
  Updated to reflect fix to zope.proxies.  Now non-data descriptors are
  overridden by proxied objects.  We use non_overridable to make
  __reduce__ a data descriptor so that it is not overridden.
  

Changed:
  U   Zope3/branches/jim-adapter/src/zope/app/location/location.py

-=-
Modified: Zope3/branches/jim-adapter/src/zope/app/location/location.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/location/location.py	2006-04-02 16:59:05 UTC (rev 66294)
+++ Zope3/branches/jim-adapter/src/zope/app/location/location.py	2006-04-02 16:59:07 UTC (rev 66295)
@@ -19,7 +19,7 @@
 
 import zope.interface
 from zope.app.location.interfaces import ILocation
-from zope.proxy import ProxyBase, getProxiedObject
+from zope.proxy import ProxyBase, getProxiedObject, non_overridable
 from zope.app.decorator import DecoratorSpecificationDescriptor
 from zope.app.decorator import DecoratedSecurityCheckerDescriptor
 
@@ -161,6 +161,7 @@
         self.__parent__ = container
         self.__name__ = name
 
+    @non_overridable
     def __reduce__(self, proto=None):
         raise TypeError("Not picklable")