[Checkins] SVN: Products.CMFCore/branches/cookiecrumbler_with_views/ merged 111309-113182 from trunk
Yvo Schubbe
y.2010 at wcm-solutions.de
Mon Jun 7 05:37:13 EDT 2010
Log message for revision 113234:
merged 111309-113182 from trunk
Changed:
A Products.CMFCore/branches/cookiecrumbler_with_views/.bzrignore
U Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/CHANGES.txt
U Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/FSDTMLMethod.py
U Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/permissions.py
U Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/testing.py
U Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/tests/test_ActionInformation.py
U Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/tests/test_FSFile.py
U Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/tests/test_zcml.py
A Products.CMFCore/branches/cookiecrumbler_with_views/bootstrap.py
A Products.CMFCore/branches/cookiecrumbler_with_views/buildout.cfg
A Products.CMFCore/branches/cookiecrumbler_with_views/docs/
-=-
Copied: Products.CMFCore/branches/cookiecrumbler_with_views/.bzrignore (from rev 113182, Products.CMFCore/trunk/.bzrignore)
===================================================================
--- Products.CMFCore/branches/cookiecrumbler_with_views/.bzrignore (rev 0)
+++ Products.CMFCore/branches/cookiecrumbler_with_views/.bzrignore 2010-06-07 09:37:13 UTC (rev 113234)
@@ -0,0 +1,8 @@
+./bin
+./develop-eggs
+./eggs
+./parts
+*.egg-info
+./.installed.cfg
+*.egg
+docs/_build
Modified: Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/CHANGES.txt
===================================================================
--- Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/CHANGES.txt 2010-06-07 08:19:58 UTC (rev 113233)
+++ Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/CHANGES.txt 2010-06-07 09:37:13 UTC (rev 113234)
@@ -4,6 +4,10 @@
2.3.0-alpha (unreleased)
------------------------
+- Use the standard libraries doctest module.
+
+- Updated setDefaultRoles to use the addPermission API if available.
+
- Added a permissions.zcml file defining our own permissions. This was
formerly done in Zope 2's Products.Five.
Modified: Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/FSDTMLMethod.py
===================================================================
--- Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/FSDTMLMethod.py 2010-06-07 08:19:58 UTC (rev 113233)
+++ Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/FSDTMLMethod.py 2010-06-07 09:37:13 UTC (rev 113234)
@@ -15,7 +15,6 @@
$Id$
"""
-from AccessControl.DTML import RestrictedDTML
from AccessControl.Role import RoleManager
from AccessControl.SecurityInfo import ClassSecurityInfo
from AccessControl.SecurityManagement import getSecurityManager
@@ -34,6 +33,12 @@
from Products.CMFCore.utils import _dtmldir
from Products.CMFCore.utils import _setCacheHeaders
+# BBB for Zope 2.12
+try:
+ from DocumentTemplate.security import RestrictedDTML
+except ImportError:
+ from AccessControl.DTML import RestrictedDTML
+
_marker = object()
Modified: Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/permissions.py
===================================================================
--- Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/permissions.py 2010-06-07 08:19:58 UTC (rev 113233)
+++ Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/permissions.py 2010-06-07 09:37:13 UTC (rev 113234)
@@ -55,20 +55,29 @@
security.declarePublic('ViewManagementScreens')
ViewManagementScreens = Permissions.view_management_screens
+addPermission = None
+try:
+ from AccessControl.Permission import addPermission
+except ImportError:
+ pass
+
security.declarePrivate('setDefaultRoles')
def setDefaultRoles(permission, roles):
'''
Sets the defaults roles for a permission.
'''
- import Products
- # XXX This ought to be in AccessControl.SecurityInfo.
- registered = _registeredPermissions
- if not registered.has_key(permission):
- registered[permission] = 1
- Products.__ac_permissions__=(
- Products.__ac_permissions__+((permission,(),roles),))
- mangled = pname(permission)
- setattr(ApplicationDefaultPermissions, mangled, roles)
+ if addPermission is not None:
+ addPermission(permission, roles)
+ else:
+ # BBB This is in AccessControl starting in Zope 2.13
+ import Products
+ registered = _registeredPermissions
+ if not registered.has_key(permission):
+ registered[permission] = 1
+ Products.__ac_permissions__=(
+ Products.__ac_permissions__+((permission,(),roles),))
+ mangled = pname(permission)
+ setattr(ApplicationDefaultPermissions, mangled, roles)
# Note that we can only use the default Zope roles in calls to
# setDefaultRoles(). The default Zope roles are:
Modified: Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/testing.py
===================================================================
--- Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/testing.py 2010-06-07 08:19:58 UTC (rev 113233)
+++ Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/testing.py 2010-06-07 09:37:13 UTC (rev 113234)
@@ -14,7 +14,6 @@
"""
from OFS.SimpleItem import SimpleItem
-from Products.Five import zcml
from Testing.ZopeTestCase.layer import ZopeLite
from zope.component import adapts
from zope.i18n.interfaces import IUserPreferredLanguages
@@ -28,7 +27,13 @@
from Products.CMFCore.interfaces import IWorkflowDefinition
from Products.GenericSetup.utils import BodyAdapterBase
+# BBB for Zope 2.12
+try:
+ from Zope2.App import zcml
+except ImportError:
+ from Products.Five import zcml
+
class ConformsToFolder:
def test_folder_interfaces(self):
Modified: Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/tests/test_ActionInformation.py
===================================================================
--- Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/tests/test_ActionInformation.py 2010-06-07 08:19:58 UTC (rev 113233)
+++ Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/tests/test_ActionInformation.py 2010-06-07 09:37:13 UTC (rev 113234)
@@ -107,7 +107,7 @@
request.set('manage_page_header', _header)
request.set('manage_page_footer', _footer)
request.set('BASEPATH1', '/one/two')
- request.set('URL1', '/one/two')
+ setattr(request, 'URL1', '/one/two')
request._steps = ['one', 'two']
prd = {'ac_permissions': ('a', 'b')}
Modified: Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/tests/test_FSFile.py
===================================================================
--- Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/tests/test_FSFile.py 2010-06-07 08:19:58 UTC (rev 113233)
+++ Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/tests/test_FSFile.py 2010-06-07 09:37:13 UTC (rev 113234)
@@ -230,7 +230,7 @@
mtype, ignore_enc = mimetypes.guess_type(file_name)
file = self._makeOne(file_name, file_name)
file = file.__of__(self.root)
- data = file.index_html(self.REQUEST, self.RESPONSE)
+ file.index_html(self.REQUEST, self.RESPONSE)
self.assertEqual(self.RESPONSE.getHeader('content-type'),
'%s; charset=utf-8' % mtype)
Modified: Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/tests/test_zcml.py
===================================================================
--- Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/tests/test_zcml.py 2010-06-07 08:19:58 UTC (rev 113233)
+++ Products.CMFCore/branches/cookiecrumbler_with_views/Products/CMFCore/tests/test_zcml.py 2010-06-07 09:37:13 UTC (rev 113234)
@@ -15,9 +15,8 @@
$Id$
"""
+import doctest
import unittest
-import Testing
-from zope.testing import doctest
def test_registerDirectory():
@@ -25,7 +24,12 @@
Use the cmf:registerDirectory directive::
>>> import Products.CMFCore
- >>> from Products.Five import zcml
+ >>> # BBB for Zope 2.12
+ ... try:
+ ... from Zope2.App import zcml
+ ... except ImportError:
+ ... from Products.Five import zcml
+
>>> configure_zcml = '''
... <configure xmlns:cmf="http://namespaces.zope.org/cmf">
... <cmf:registerDirectory
@@ -68,6 +72,3 @@
return unittest.TestSuite((
doctest.DocTestSuite(),
))
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
Copied: Products.CMFCore/branches/cookiecrumbler_with_views/bootstrap.py (from rev 113182, Products.CMFCore/trunk/bootstrap.py)
===================================================================
--- Products.CMFCore/branches/cookiecrumbler_with_views/bootstrap.py (rev 0)
+++ Products.CMFCore/branches/cookiecrumbler_with_views/bootstrap.py 2010-06-07 09:37:13 UTC (rev 113234)
@@ -0,0 +1,121 @@
+##############################################################################
+#
+# Copyright (c) 2006 Zope Foundation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (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.
+#
+##############################################################################
+"""Bootstrap a buildout-based project
+
+Simply run this script in a directory containing a buildout.cfg.
+The script accepts buildout command-line options, so you can
+use the -c option to specify an alternate configuration file.
+
+$Id$
+"""
+
+import os, shutil, sys, tempfile, urllib2
+from optparse import OptionParser
+
+tmpeggs = tempfile.mkdtemp()
+
+is_jython = sys.platform.startswith('java')
+
+# parsing arguments
+parser = OptionParser()
+parser.add_option("-v", "--version", dest="version",
+ help="use a specific zc.buildout version")
+parser.add_option("-d", "--distribute",
+ action="store_true", dest="distribute", default=False,
+ help="Use Disribute rather than Setuptools.")
+
+parser.add_option("-c", None, action="store", dest="config_file",
+ help=("Specify the path to the buildout configuration "
+ "file to be used."))
+
+options, args = parser.parse_args()
+
+# if -c was provided, we push it back into args for buildout' main function
+if options.config_file is not None:
+ args += ['-c', options.config_file]
+
+if options.version is not None:
+ VERSION = '==%s' % options.version
+else:
+ VERSION = ''
+
+USE_DISTRIBUTE = options.distribute
+args = args + ['bootstrap']
+
+to_reload = False
+try:
+ import pkg_resources
+ if not hasattr(pkg_resources, '_distribute'):
+ to_reload = True
+ raise ImportError
+except ImportError:
+ ez = {}
+ if USE_DISTRIBUTE:
+ exec urllib2.urlopen('http://python-distribute.org/distribute_setup.py'
+ ).read() in ez
+ ez['use_setuptools'](to_dir=tmpeggs, download_delay=0, no_fake=True)
+ else:
+ exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
+ ).read() in ez
+ ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
+
+ if to_reload:
+ reload(pkg_resources)
+ else:
+ import pkg_resources
+
+if sys.platform == 'win32':
+ def quote(c):
+ if ' ' in c:
+ return '"%s"' % c # work around spawn lamosity on windows
+ else:
+ return c
+else:
+ def quote (c):
+ return c
+
+cmd = 'from setuptools.command.easy_install import main; main()'
+ws = pkg_resources.working_set
+
+if USE_DISTRIBUTE:
+ requirement = 'distribute'
+else:
+ requirement = 'setuptools'
+
+if is_jython:
+ import subprocess
+
+ assert subprocess.Popen([sys.executable] + ['-c', quote(cmd), '-mqNxd',
+ quote(tmpeggs), 'zc.buildout' + VERSION],
+ env=dict(os.environ,
+ PYTHONPATH=
+ ws.find(pkg_resources.Requirement.parse(requirement)).location
+ ),
+ ).wait() == 0
+
+else:
+ assert os.spawnle(
+ os.P_WAIT, sys.executable, quote (sys.executable),
+ '-c', quote (cmd), '-mqNxd', quote (tmpeggs), 'zc.buildout' + VERSION,
+ dict(os.environ,
+ PYTHONPATH=
+ ws.find(pkg_resources.Requirement.parse(requirement)).location
+ ),
+ ) == 0
+
+ws.add_entry(tmpeggs)
+ws.require('zc.buildout' + VERSION)
+import zc.buildout.buildout
+zc.buildout.buildout.main(args)
+shutil.rmtree(tmpeggs)
Copied: Products.CMFCore/branches/cookiecrumbler_with_views/buildout.cfg (from rev 113182, Products.CMFCore/trunk/buildout.cfg)
===================================================================
--- Products.CMFCore/branches/cookiecrumbler_with_views/buildout.cfg (rev 0)
+++ Products.CMFCore/branches/cookiecrumbler_with_views/buildout.cfg 2010-06-07 09:37:13 UTC (rev 113234)
@@ -0,0 +1,31 @@
+[buildout]
+develop = .
+parts =
+ test
+ zopepy
+ sphinx
+
+unzip = true
+
+
+[test]
+recipe = zc.recipe.testrunner
+eggs = Products.CMFCore
+
+
+[zopepy]
+recipe = zc.recipe.egg
+eggs =
+ Zope2
+ Products.GenericSetup
+interpreter = zopepy
+scripts = zopepy
+
+
+[sphinx]
+recipe = zc.recipe.egg
+eggs =
+ Sphinx
+ Zope2
+ five.localsitemanager
+ repoze.sphinx.autointerface
More information about the checkins
mailing list