[Zope3-checkins] SVN: Zope3/branches/ZopeX3-3.0/src/zope/security/ Merged from trunk

[Jim Fulton]

Log message for revision 26789:
  Merged from trunk
  
    r26752 | jim | 2004-07-25 10:20:25 -0400 (Sun, 25 Jul 2004) | 10 lines
  
  
  Removed the special treatment of exception classes.  Previously, we
    treated excptions and xception clases as basic objects that were not
    proxied. This strategy seems overly lax. The problem is that we
    don't really kow how to raise or catch exceptions if exceptions and
    exception classes are proxied. The answer is not to be lax with
    exceptions. Rather, we'll need to change the way exceptions are
    handled in untrusted python code. This will require code
    manipulation, which we've avoided until recently.
  


Changed:
  U   Zope3/branches/ZopeX3-3.0/src/zope/security/checker.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/security/tests/test_checker.py


-=-
Modified: Zope3/branches/ZopeX3-3.0/src/zope/security/checker.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/security/checker.py	2004-07-27 14:16:47 UTC (rev 26788)
+++ Zope3/branches/ZopeX3-3.0/src/zope/security/checker.py	2004-07-27 14:21:49 UTC (rev 26789)
@@ -317,9 +317,6 @@
     if checker is NoProxy:
         return None
 
-    if checker is _defaultChecker and isinstance(object, Exception):
-        return None
-
     while not isinstance(checker, Checker):
         checker = checker(object)
         if checker is NoProxy or checker is None:
@@ -503,17 +500,8 @@
         verbosity = WATCH_CHECKERS
 
 def _instanceChecker(inst):
-    checker = _checkers.get(inst.__class__, _defaultChecker)
-    if checker is _defaultChecker and isinstance(inst, Exception):
-        return NoProxy # XXX we should be more careful
-    return checker
+    return _checkers.get(inst.__class__, _defaultChecker)
 
-def _classChecker(class_):
-    if issubclass(class_, Exception):
-        return NoProxy  # XXX we should be more careful
-
-    return _typeChecker
-
 def moduleChecker(module):
     return _checkers.get(module)
 
@@ -599,7 +587,7 @@
     types.InstanceType: _instanceChecker,
     Proxy: NoProxy,
     type(weakref.ref(_Sequence())): NamesChecker(['__call__']),
-    types.ClassType: _classChecker,
+    types.ClassType: _typeChecker,
     types.FunctionType: _callableChecker,
     types.MethodType: _callableChecker,
     types.BuiltinFunctionType: _callableChecker,

Modified: Zope3/branches/ZopeX3-3.0/src/zope/security/tests/test_checker.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/security/tests/test_checker.py	2004-07-27 14:16:47 UTC (rev 26788)
+++ Zope3/branches/ZopeX3-3.0/src/zope/security/tests/test_checker.py	2004-07-27 14:21:49 UTC (rev 26789)
@@ -209,7 +209,6 @@
 
         from zope.security.checker import BasicTypes_examples
         rocks = tuple(BasicTypes_examples.values())
-        rocks += (AttributeError(), AttributeError)
         for rock in rocks:
             proxy = checker.proxy(rock)
             self.failUnless(proxy is rock, (rock, type(proxy)))