[z3-checkins] r5222 - in z3/Five/trunk: . security tests

[philikon at codespeak.net]

Author: philikon
Date: Tue Jun 22 09:09:15 2004
New Revision: 5222

Added:
   z3/Five/trunk/security.py
      - copied unchanged from r5221, z3/Five/trunk/security/permission.py
Removed:
   z3/Five/trunk/security/
Modified:
   z3/Five/trunk/fiveconfigure.py
   z3/Five/trunk/tests/test_security.py
Log:
Moved security/permission.py to security.py. This should be one of the
final steps in flattening Five.


Modified: z3/Five/trunk/fiveconfigure.py
==============================================================================
--- z3/Five/trunk/fiveconfigure.py	(original)
+++ z3/Five/trunk/fiveconfigure.py	Tue Jun 22 09:09:15 2004
@@ -21,7 +21,7 @@
 from viewable import Viewable
 from api import BrowserView
 from metaclass import makeClass
-from security.permission import getSecurityInfo, CheckerPublic
+from security import getSecurityInfo, CheckerPublic
 from metaconfigure import protectName, initializeClass
 
 #def handler(serviceName, methodName, *args, **kwargs):

Modified: z3/Five/trunk/tests/test_security.py
==============================================================================
--- z3/Five/trunk/tests/test_security.py	(original)
+++ z3/Five/trunk/tests/test_security.py	Tue Jun 22 09:09:15 2004
@@ -28,7 +28,7 @@
 from zope.testing.cleanup import CleanUp
 from Products.Five import zcml
 from Products.Five.viewable import FakeRequest
-from Products.Five.security.permission import clearSecurityInfo
+from Products.Five.security import clearSecurityInfo
 from Products.Five.tests.dummy import Dummy1, Dummy2
 from Globals import InitializeClass