[Zope3-checkins] SVN: Zope3/branches/ZopeX3-3.0/src/zope/ Backported
Stephan Richter
srichter at cosmos.phy.tufts.edu
Thu Aug 12 12:16:03 EDT 2004
Log message for revision 27057:
Backported
r26480 | srichter | 2004-07-13 13:03:22 -0400 (Tue, 13 Jul 2004) | 2 lines
r26481 | srichter | 2004-07-13 13:04:09 -0400 (Tue, 13 Jul 2004) | 3 lines
r26482 | srichter | 2004-07-13 13:07:03 -0400 (Tue, 13 Jul 2004) | 2 lines
r26485 | srichter | 2004-07-13 13:11:43 -0400 (Tue, 13 Jul 2004) | 2 lines
r26486 | srichter | 2004-07-13 13:12:34 -0400 (Tue, 13 Jul 2004) | 3 lines
Changed:
U Zope3/branches/ZopeX3-3.0/src/zope/app/security/_protections.py
U Zope3/branches/ZopeX3-3.0/src/zope/app/security/configure.zcml
D Zope3/branches/ZopeX3-3.0/src/zope/proxy/introspection.py
U Zope3/branches/ZopeX3-3.0/src/zope/proxy/tests/test_proxy.py
-=-
Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/security/_protections.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/security/_protections.py 2004-08-12 16:09:51 UTC (rev 27056)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/security/_protections.py 2004-08-12 16:16:03 UTC (rev 27057)
@@ -26,5 +26,5 @@
# add __parent__ and __name__ to always available names
import zope.security.checker
for name in ['__name__', '__parent__']:
- if name not in zope.security.checker._always_available:
- zope.security.checker._always_available.append(name)
+ if name not in zope.security.checker._available_by_default:
+ zope.security.checker._available_by_default.append(name)
Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/security/configure.zcml
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/security/configure.zcml 2004-08-12 16:09:51 UTC (rev 27056)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/security/configure.zcml 2004-08-12 16:16:03 UTC (rev 27057)
@@ -40,7 +40,12 @@
<allow interface=".interfaces.IPrincipal" />
</content>
+ <content class=".settings.PermissionSetting">
+ <require permission="zope.Security"
+ attributes="getName getDescription __str__" />
+ </content>
+
<!-- Standard Permissions -->
<permission
Deleted: Zope3/branches/ZopeX3-3.0/src/zope/proxy/introspection.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/proxy/introspection.py 2004-08-12 16:09:51 UTC (rev 27056)
+++ Zope3/branches/ZopeX3-3.0/src/zope/proxy/introspection.py 2004-08-12 16:16:03 UTC (rev 27057)
@@ -1,36 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-
-# XXX this module should bnecome unnecessary
-
-"""Temporary hack module until there is a generic way to deal with proxies
-
-This module provides some standard machinery to recognize and remove
-proxies. It is hoped that it will be replaced by a cleaner implementation
-based on a common proxy base class.
-
-This module requires that proxy implementations register themselves with the
-module, by calling defineProxyType, however, it short-circuits the definitions
-for two types, which, hopefully will be the only two types that need to get
-registered. ;)
-
-$Id$
-"""
-
-import warnings
-from zope.proxy._zope_proxy_proxy import removeAllProxies, isProxy
-
-warnings.warn("The zope.proxy.introspection module is deprecated. "
- "Use zope.proxy instead.",
- DeprecationWarning, 2)
Modified: Zope3/branches/ZopeX3-3.0/src/zope/proxy/tests/test_proxy.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/proxy/tests/test_proxy.py 2004-08-12 16:09:51 UTC (rev 27056)
+++ Zope3/branches/ZopeX3-3.0/src/zope/proxy/tests/test_proxy.py 2004-08-12 16:16:03 UTC (rev 27057)
@@ -259,7 +259,7 @@
"x=%r; y=%r; expr=%r" % (x, y, expr))
def test_inplace(self):
- # XXX should test all inplace operators...
+ # TODO: should test all inplace operators...
P = self.new_proxy
pa = P(1)
More information about the Zope3-Checkins
mailing list