[Checkins] SVN: z3ext.security/trunk/ update tests
Nikolay Kim
fafhrd91 at gmail.com
Tue Dec 22 18:57:21 EST 2009
Log message for revision 106982:
update tests
Changed:
U z3ext.security/trunk/CHANGES.txt
U z3ext.security/trunk/buildout.cfg
U z3ext.security/trunk/setup.py
U z3ext.security/trunk/src/z3ext/security/configure.zcml
U z3ext.security/trunk/src/z3ext/security/groups.py
U z3ext.security/trunk/src/z3ext/security/securitypolicy.py
U z3ext.security/trunk/src/z3ext/security/securitypolicy.txt
U z3ext.security/trunk/src/z3ext/security/tests.py
U z3ext.security/trunk/src/z3ext/security/utils.py
U z3ext.security/trunk/src/z3ext/security/vocabulary.py
-=-
Modified: z3ext.security/trunk/CHANGES.txt
===================================================================
--- z3ext.security/trunk/CHANGES.txt 2009-12-22 23:57:03 UTC (rev 106981)
+++ z3ext.security/trunk/CHANGES.txt 2009-12-22 23:57:20 UTC (rev 106982)
@@ -2,6 +2,15 @@
CHANGES
=======
+
+1.4.0 (Unreleased)
+------------------
+
+- ZTK support
+
+- Cleanup dependencies
+
+
1.3.0 (2009-05-29)
------------------
Modified: z3ext.security/trunk/buildout.cfg
===================================================================
--- z3ext.security/trunk/buildout.cfg 2009-12-22 23:57:03 UTC (rev 106981)
+++ z3ext.security/trunk/buildout.cfg 2009-12-22 23:57:20 UTC (rev 106982)
@@ -4,11 +4,11 @@
[test]
recipe = zc.recipe.testrunner
-eggs = z3ext.security [test]
+eggs = z3ext.security
[coverage-test]
recipe = zc.recipe.testrunner
-eggs = z3ext.security [test]
+eggs = z3ext.security
defaults = ['--coverage', '../../coverage']
[coverage-report]
Modified: z3ext.security/trunk/setup.py
===================================================================
--- z3ext.security/trunk/setup.py 2009-12-22 23:57:03 UTC (rev 106981)
+++ z3ext.security/trunk/setup.py 2009-12-22 23:57:20 UTC (rev 106982)
@@ -21,7 +21,7 @@
def read(*rnames):
return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
-version = '1.3.1dev'
+version = '0'
setup(name='z3ext.security',
@@ -51,7 +51,7 @@
'Framework :: Zope3'],
author='Nikolay Kim',
author_email='fafhrd91 at gmail.com',
- url='http://z3ext.net/',
+ url='http://http://pypi.python.org/pypi/z3ext.security/',
license='ZPL 2.1',
packages=find_packages('src'),
package_dir = {'':'src'},
@@ -61,11 +61,8 @@
'zope.interface',
'zope.security',
'zope.securitypolicy',
- 'zope.app.security',
+ 'zope.authentication',
],
- extras_require = dict(test=['zope.app.testing',
- 'zope.testing',
- ]),
include_package_data = True,
zip_safe = False
)
Modified: z3ext.security/trunk/src/z3ext/security/configure.zcml
===================================================================
--- z3ext.security/trunk/src/z3ext/security/configure.zcml 2009-12-22 23:57:03 UTC (rev 106981)
+++ z3ext.security/trunk/src/z3ext/security/configure.zcml 2009-12-22 23:57:20 UTC (rev 106982)
@@ -13,13 +13,6 @@
<allow interface=".interfaces.IExtendedGrantInfo" />
</class>
- <!-- add security declaration for anonymous -->
- <class class="zope.app.security.principalregistry.UnauthenticatedPrincipal">
- <require
- permission="zope.Public"
- interface="zope.security.interfaces.IPrincipal" />
- </class>
-
<!-- Public Roles/Permissions vocabulary -->
<utility
name="z3ext.roles"
Modified: z3ext.security/trunk/src/z3ext/security/groups.py
===================================================================
--- z3ext.security/trunk/src/z3ext/security/groups.py 2009-12-22 23:57:03 UTC (rev 106981)
+++ z3ext.security/trunk/src/z3ext/security/groups.py 2009-12-22 23:57:20 UTC (rev 106982)
@@ -19,7 +19,7 @@
from zope.component import getUtility
from zope.security.proxy import removeSecurityProxy
from zope.security.interfaces import IPrincipal, IGroup, IGroupAwarePrincipal
-from zope.app.security.interfaces import IAuthentication
+from zope.authentication.interfaces import IAuthentication
from interfaces import IPrincipalGroups
Modified: z3ext.security/trunk/src/z3ext/security/securitypolicy.py
===================================================================
--- z3ext.security/trunk/src/z3ext/security/securitypolicy.py 2009-12-22 23:57:03 UTC (rev 106981)
+++ z3ext.security/trunk/src/z3ext/security/securitypolicy.py 2009-12-22 23:57:20 UTC (rev 106982)
@@ -18,14 +18,11 @@
from zope import interface
from zope.component import getAdapters
from zope.security.proxy import removeSecurityProxy
-from zope.app.security.settings import Allow
-
+from zope.securitypolicy.settings import Allow
from zope.securitypolicy.interfaces import IPrincipalRoleMap
from zope.securitypolicy.interfaces import IRolePermissionMap
from zope.securitypolicy.interfaces import IPrincipalPermissionMap
-
from zope.securitypolicy.zopepolicy import ZopeSecurityPolicy
-
from zope.securitypolicy.zopepolicy import SettingAsBoolean
from zope.securitypolicy.zopepolicy import globalRolesForPrincipal
from zope.securitypolicy.zopepolicy import globalRolesForPermission
Modified: z3ext.security/trunk/src/z3ext/security/securitypolicy.txt
===================================================================
--- z3ext.security/trunk/src/z3ext/security/securitypolicy.txt 2009-12-22 23:57:03 UTC (rev 106981)
+++ z3ext.security/trunk/src/z3ext/security/securitypolicy.txt 2009-12-22 23:57:20 UTC (rev 106982)
@@ -79,7 +79,7 @@
Now we need custom IPrincipalRoleMap:
- >>> from zope.app.security.settings import Allow, Deny
+ >>> from zope.securitypolicy.settings import Allow, Deny
>>> class OwnerRolesMap(object):
... zope.interface.implements(interfaces.IPrincipalRoleMap)
Modified: z3ext.security/trunk/src/z3ext/security/tests.py
===================================================================
--- z3ext.security/trunk/src/z3ext/security/tests.py 2009-12-22 23:57:03 UTC (rev 106981)
+++ z3ext.security/trunk/src/z3ext/security/tests.py 2009-12-22 23:57:20 UTC (rev 106982)
@@ -18,8 +18,8 @@
__docformat__ = "reStructuredText"
import unittest, doctest
-from zope import interface, schema
-from zope.app.testing import setup, ztapi
+from zope import interface, schema, component
+from zope.component.testing import tearDown
from zope.security.management import endInteraction
from zope.securitypolicy.tests import test_zopepolicy
from z3ext.security.grantinfo import ExtendedGrantInfo
@@ -28,13 +28,10 @@
def setUp(test):
test_zopepolicy.setUp(test)
- ztapi.provideAdapter(
- interface.Interface, IExtendedGrantInfo, ExtendedGrantInfo)
+ component.provideAdapter(
+ ExtendedGrantInfo, (interface.Interface,), IExtendedGrantInfo)
-def tearDown(test):
- setup.placelessTearDown()
-
def test_suite():
return unittest.TestSuite((
doctest.DocFileSuite(
@@ -45,7 +42,6 @@
'zcml.txt', setUp=setUp, tearDown=tearDown,
optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS),
doctest.DocTestSuite(
- 'z3ext.security.vocabulary',
- setUp=setup.placelessSetUp, tearDown=setup.placelessTearDown,
+ 'z3ext.security.vocabulary', setUp=setUp, tearDown=tearDown,
optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS),
))
Modified: z3ext.security/trunk/src/z3ext/security/utils.py
===================================================================
--- z3ext.security/trunk/src/z3ext/security/utils.py 2009-12-22 23:57:03 UTC (rev 106981)
+++ z3ext.security/trunk/src/z3ext/security/utils.py 2009-12-22 23:57:20 UTC (rev 106982)
@@ -18,7 +18,7 @@
from zope.component import getUtility
from zope.security.proxy import removeSecurityProxy
from zope.security.management import queryInteraction
-from zope.app.security.interfaces import IAuthentication, PrincipalLookupError
+from zope.authentication.interfaces import IAuthentication, PrincipalLookupError
from interfaces import IZ3extSecurityPolicy
Modified: z3ext.security/trunk/src/z3ext/security/vocabulary.py
===================================================================
--- z3ext.security/trunk/src/z3ext/security/vocabulary.py 2009-12-22 23:57:03 UTC (rev 106981)
+++ z3ext.security/trunk/src/z3ext/security/vocabulary.py 2009-12-22 23:57:20 UTC (rev 106982)
@@ -23,15 +23,6 @@
from interfaces import IPublicRole, IPublicPermission
-class Vocabulary(SimpleVocabulary):
-
- def getTerm(self, value):
- try:
- return self.by_value[value]
- except KeyError:
- return self.by_value[self.by_value.keys()[0]]
-
-
class RolesVocabulary(object):
"""
>>> from zope import interface, component
@@ -64,7 +55,7 @@
term.description = getattr(role, 'description', u'')
roles.append((role.title, term))
roles.sort()
- return Vocabulary([term for title, term in roles])
+ return SimpleVocabulary([term for title, term in roles])
class PermissionsVocabulary(object):
@@ -96,4 +87,4 @@
for name, perm in getUtilitiesFor(IPublicPermission):
perms.append((perm.title, SimpleTerm(perm.id, perm.id, perm.title)))
perms.sort()
- return Vocabulary([term for title, term in perms])
+ return SimpleVocabulary([term for title, term in perms])
More information about the checkins
mailing list