[Zope-Checkins] CVS: Zope/lib/python/AccessControl - ZopeSecurityPolicy.py:1.20.4.3

[Tres Seaver]

Update of /cvs-repository/Zope/lib/python/AccessControl
In directory cvs.zope.org:/tmp/cvs-serv21533/lib/python/AccessControl

Modified Files:
      Tag: Zope-2_6-branch
	ZopeSecurityPolicy.py 
Log Message:


  - Collector #1168: Import error in
    lib/python/AccessControl/ZopeSecurityPolicy.py:

    o Import the name UnicodeType, since we use it.

    o Add a test that we can validate Unicode names.

    o Fix a test which broke under ZOPE_SECURITY_POLICY=Python, because
      the "base" exception (zExceptions.Unauthorize) is raised in that
      case, rather than the "derived" one (AccessControl.Unauthorized).


=== Zope/lib/python/AccessControl/ZopeSecurityPolicy.py 1.20.4.2 => 1.20.4.3 ===
--- Zope/lib/python/AccessControl/ZopeSecurityPolicy.py:1.20.4.2	Thu Jan  8 15:12:07 2004
+++ Zope/lib/python/AccessControl/ZopeSecurityPolicy.py	Fri Jan  9 14:07:16 2004
@@ -33,7 +33,7 @@
 
 if _use_python_impl:
 
-    from types import StringType
+    from types import StringType, UnicodeType
 
     import SimpleObjectPolicies
     from AccessControl import Unauthorized
@@ -77,7 +77,6 @@
         def validate(self, accessed, container, name, value, context,
                      roles=_noroles, type=type, IntType=type(0),
                      DictType=type({}), getattr=getattr, _noroles=_noroles,
-                     StringType=type(''),
                      Containers=SimpleObjectPolicies.Containers,
                      valid_aq_=('aq_parent','aq_inner', 'aq_explicit')):