[Zope-Checkins] CVS: Zope/lib/python/AccessControl/tests - testClassSecurityInfo.py:1.3 testDeprecatedAPI.py:1.4 testModuleSecurity.py:1.3 testPasswordDigest.py:1.4 testPermissionRole.py:1.3 testSecurity.py:1.10 testUserFolder.py:1.5 testZopeSecurityPolicy.py:1.5
Martijn Pieters
mj@zope.com
Wed, 14 Aug 2002 17:28:08 -0400
Update of /cvs-repository/Zope/lib/python/AccessControl/tests
In directory cvs.zope.org:/tmp/cvs-serv12109
Modified Files:
testClassSecurityInfo.py testDeprecatedAPI.py
testModuleSecurity.py testPasswordDigest.py
testPermissionRole.py testSecurity.py testUserFolder.py
testZopeSecurityPolicy.py
Log Message:
Clean up indentation and trailing whitespace.
=== Zope/lib/python/AccessControl/tests/testClassSecurityInfo.py 1.2 => 1.3 ===
--- Zope/lib/python/AccessControl/tests/testClassSecurityInfo.py:1.2 Fri Apr 12 11:22:42 2002
+++ Zope/lib/python/AccessControl/tests/testClassSecurityInfo.py Wed Aug 14 17:28:08 2002
@@ -1,14 +1,14 @@
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (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
-#
+#
##############################################################################
""" """
=== Zope/lib/python/AccessControl/tests/testDeprecatedAPI.py 1.3 => 1.4 ===
--- Zope/lib/python/AccessControl/tests/testDeprecatedAPI.py:1.3 Wed Nov 28 10:50:52 2001
+++ Zope/lib/python/AccessControl/tests/testDeprecatedAPI.py Wed Aug 14 17:28:08 2002
@@ -1,15 +1,14 @@
-
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (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
-#
+#
##############################################################################
"""Tests for the DeprecationWarning thrown by accessing hasRole
@@ -29,7 +28,7 @@
# We test for warnings by turning them into exceptions
warnings.filterwarnings('error', category=DeprecationWarning,
module='AccessControl')
-
+
def testDeprecatedHasRole(self):
"""hasRole has been deprecated, we expect a warning."""
try:
=== Zope/lib/python/AccessControl/tests/testModuleSecurity.py 1.2 => 1.3 ===
--- Zope/lib/python/AccessControl/tests/testModuleSecurity.py:1.2 Fri Jan 11 12:14:27 2002
+++ Zope/lib/python/AccessControl/tests/testModuleSecurity.py Wed Aug 14 17:28:08 2002
@@ -1,14 +1,14 @@
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (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
-#
+#
##############################################################################
"""Module Import Tests
"""
@@ -65,7 +65,7 @@
for fromlist in (), ('pub',):
self.assertAuth(
'AccessControl.tests.public_module%s' % name,
- fromlist)
+ fromlist)
def test_suite():
suite = unittest.TestSuite()
=== Zope/lib/python/AccessControl/tests/testPasswordDigest.py 1.3 => 1.4 ===
--- Zope/lib/python/AccessControl/tests/testPasswordDigest.py:1.3 Wed Nov 28 10:50:52 2001
+++ Zope/lib/python/AccessControl/tests/testPasswordDigest.py Wed Aug 14 17:28:08 2002
@@ -1,14 +1,14 @@
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (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
-#
+#
##############################################################################
"""Test of AuthEncoding
"""
@@ -68,7 +68,7 @@
# crypt truncates passwords and would fail these tests.
assert not AuthEncoding.pw_validate(enc, pw[:-2])
assert not AuthEncoding.pw_validate(enc, pw[2:])
-
+
def testBlankPassword(self):
pw = ''
for id in AuthEncoding.listSchemes():
=== Zope/lib/python/AccessControl/tests/testPermissionRole.py 1.2 => 1.3 ===
--- Zope/lib/python/AccessControl/tests/testPermissionRole.py:1.2 Wed Nov 28 10:50:52 2001
+++ Zope/lib/python/AccessControl/tests/testPermissionRole.py Wed Aug 14 17:28:08 2002
@@ -1,14 +1,14 @@
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (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
-#
+#
##############################################################################
"""Tests of PermissionRole
"""
=== Zope/lib/python/AccessControl/tests/testSecurity.py 1.9 => 1.10 ===
--- Zope/lib/python/AccessControl/tests/testSecurity.py:1.9 Wed Apr 3 15:59:49 2002
+++ Zope/lib/python/AccessControl/tests/testSecurity.py Wed Aug 14 17:28:08 2002
@@ -1,14 +1,14 @@
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (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
-#
+#
##############################################################################
"""Document Template Tests
"""
=== Zope/lib/python/AccessControl/tests/testUserFolder.py 1.4 => 1.5 ===
--- Zope/lib/python/AccessControl/tests/testUserFolder.py:1.4 Wed Nov 28 10:50:52 2001
+++ Zope/lib/python/AccessControl/tests/testUserFolder.py Wed Aug 14 17:28:08 2002
@@ -1,14 +1,14 @@
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (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
-#
+#
##############################################################################
"""User folder tests
"""
@@ -39,7 +39,7 @@
self.acl_users = self
for i in xrange(count):
self.users.append("Nobody")
-
+
def getUsers(self):
return self.users
=== Zope/lib/python/AccessControl/tests/testZopeSecurityPolicy.py 1.4 => 1.5 ===
--- Zope/lib/python/AccessControl/tests/testZopeSecurityPolicy.py:1.4 Fri Jan 11 12:14:27 2002
+++ Zope/lib/python/AccessControl/tests/testZopeSecurityPolicy.py Wed Aug 14 17:28:08 2002
@@ -1,14 +1,14 @@
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (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
-#
+#
##############################################################################
"""Tests of ZopeSecurityPolicy
"""
@@ -216,7 +216,7 @@
o_context = SecurityContext(self.uf.getUserById('theowner'))
v = self.policy.checkPermission('View', r_item, o_context)
assert v, '_View_Permission should grant access to theowner'
-
+
def testAqNames(self):
policy = self.policy
assert not policy.validate('', '', 'aq_self', '', None)
@@ -255,4 +255,3 @@
if __name__ == '__main__':
main()
-