[Checkins] SVN: zope.app.applicationcontrol/trunk/ - Move 'zope.ManageApplication' permission from zope.app.security package
Nikolay Kim
fafhrd91 at gmail.com
Sat Dec 19 23:56:48 EST 2009
Log message for revision 106802:
- Move 'zope.ManageApplication' permission from zope.app.security package
- Break dependency on ``zope.app.appsetup`` by using a conditional import
Changed:
U zope.app.applicationcontrol/trunk/CHANGES.txt
U zope.app.applicationcontrol/trunk/setup.py
U zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/configure.zcml
U zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/tests/test_servercontrolview.py
U zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/tests/test_translationdomaincontrol_functional.py
U zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/zodbcontrol.py
U zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/configure.zcml
U zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/interfaces.py
U zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/runtimeinfo.py
U zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/testing.py
U zope.app.applicationcontrol/trunk/test.py
-=-
Modified: zope.app.applicationcontrol/trunk/CHANGES.txt
===================================================================
--- zope.app.applicationcontrol/trunk/CHANGES.txt 2009-12-20 04:54:19 UTC (rev 106801)
+++ zope.app.applicationcontrol/trunk/CHANGES.txt 2009-12-20 04:56:48 UTC (rev 106802)
@@ -5,6 +5,11 @@
Version 3.5.2 (unreleased)
--------------------------
+- Move 'zope.ManageApplication' permission from zope.app.security package
+
+- Break dependency on ``zope.app.appsetup`` by using a conditional import
+
+
Version 3.5.1 (2009-08-15)
--------------------------
Modified: zope.app.applicationcontrol/trunk/setup.py
===================================================================
--- zope.app.applicationcontrol/trunk/setup.py 2009-12-20 04:54:19 UTC (rev 106801)
+++ zope.app.applicationcontrol/trunk/setup.py 2009-12-20 04:56:48 UTC (rev 106802)
@@ -27,7 +27,7 @@
setup(name='zope.app.applicationcontrol',
version = version,
- author='Zope Corporation and Contributors',
+ author='Zope Foundation and Contributors',
author_email='zope3-dev at zope.org',
description='Zope applicationcontrol',
long_description=(
@@ -51,7 +51,8 @@
'Framework :: Zope3'],
url='http://cheeseshop.python.org/pypi/zope.app.applicationcontrol',
extras_require=dict(
- test=['zope.app.authentication',
+ test=['zope.app.appsetup',
+ 'zope.app.authentication',
'zope.app.component',
'zope.app.securitypolicy',
'zope.app.testing',
@@ -64,10 +65,11 @@
namespace_packages=['zope', 'zope.app'],
install_requires=[
'setuptools',
- 'zope.app.appsetup',
- 'zope.error',
- 'zope.i18n',
+ 'zope.component',
+ 'zope.i18nmessageid',
'zope.interface',
+ 'zope.location',
+ 'zope.security',
'zope.size',
'zope.traversing>=3.7.0',
],
Modified: zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/configure.zcml
===================================================================
--- zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/configure.zcml 2009-12-20 04:54:19 UTC (rev 106801)
+++ zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/configure.zcml 2009-12-20 04:56:48 UTC (rev 106802)
@@ -1,6 +1,8 @@
<zope:configure
+ xmlns:zcml="http://namespaces.zope.org/zcml"
xmlns:zope="http://namespaces.zope.org/zope"
- xmlns="http://namespaces.zope.org/browser">
+ xmlns="http://namespaces.zope.org/browser"
+ zcml:condition="installed zope.browserpage">
<page
for="zope.app.applicationcontrol.interfaces.IApplicationControl"
Modified: zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/tests/test_servercontrolview.py
===================================================================
--- zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/tests/test_servercontrolview.py 2009-12-20 04:54:19 UTC (rev 106801)
+++ zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/tests/test_servercontrolview.py 2009-12-20 04:56:48 UTC (rev 106802)
@@ -26,7 +26,7 @@
class ServerControlStub(object):
implements(IServerControl)
-
+
did_restart = None
did_shutdown = None
Modified: zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/tests/test_translationdomaincontrol_functional.py
===================================================================
--- zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/tests/test_translationdomaincontrol_functional.py 2009-12-20 04:54:19 UTC (rev 106801)
+++ zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/tests/test_translationdomaincontrol_functional.py 2009-12-20 04:56:48 UTC (rev 106802)
@@ -30,7 +30,7 @@
self.checkForBrokenLinks(body,
'/++etc++process/@@TranslationDomain.html',
basic='globalmgr:globalmgrpw')
-
+
def testReload(self):
response = self.publish('/++etc++process/@@TranslationDomain.html',
basic='globalmgr:globalmgrpw',
Modified: zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/zodbcontrol.py
===================================================================
--- zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/zodbcontrol.py 2009-12-20 04:54:19 UTC (rev 106801)
+++ zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/zodbcontrol.py 2009-12-20 04:56:48 UTC (rev 106802)
@@ -26,7 +26,7 @@
class ZODBControlView(object):
status = None
-
+
@property
def databases(self):
res = []
@@ -39,10 +39,10 @@
)
res.append(d)
return res
-
+
def _getSize(self, db):
"""Get the database size in a human readable format."""
- size = db.getSize()
+ size = db.getSize()
if not isinstance(size, (int, long, float)):
return str(size)
return byteDisplay(size)
Modified: zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/configure.zcml
===================================================================
--- zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/configure.zcml 2009-12-20 04:54:19 UTC (rev 106801)
+++ zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/configure.zcml 2009-12-20 04:56:48 UTC (rev 106802)
@@ -1,36 +1,42 @@
<configure
- xmlns="http://namespaces.zope.org/zope"
- i18n_domain="zope"
- >
+ xmlns="http://namespaces.zope.org/zope"
+ i18n_domain="zope"
+ >
- <class
- class=".applicationcontrol.ApplicationControl">
+ <permission
+ id="zope.ManageApplication"
+ title="[manage-application-permission] Manage Application"
+ description="Manage the Zope Application, such as Restart/Shutdown or
+ packing the ZODB."
+ />
+
+ <class class=".applicationcontrol.ApplicationControl">
<require
- permission="zope.ManageApplication"
- interface=".interfaces.IApplicationControl"/>
+ permission="zope.ManageApplication"
+ interface=".interfaces.IApplicationControl"/>
</class>
-
+
<adapter
- for=".interfaces.IApplicationControl"
- provides=".interfaces.IRuntimeInfo"
- factory=".runtimeinfo.RuntimeInfo"
- permission="zope.ManageApplication" />
-
+ for=".interfaces.IApplicationControl"
+ provides=".interfaces.IRuntimeInfo"
+ factory=".runtimeinfo.RuntimeInfo"
+ permission="zope.ManageApplication" />
+
<utility
- component=".zopeversion.ZopeVersionUtility"
- provides=".interfaces.IZopeVersion" />
+ component=".zopeversion.ZopeVersionUtility"
+ provides=".interfaces.IZopeVersion" />
<utility
- component=".applicationcontrol.applicationController"
- provides="zope.traversing.interfaces.IEtcNamespace"
- name="process"
- />
+ component=".applicationcontrol.applicationController"
+ provides="zope.traversing.interfaces.IEtcNamespace"
+ name="process"
+ />
<utility
- component=".applicationcontrol.applicationController"
- provides="zope.traversing.interfaces.IEtcNamespace"
- name="ApplicationController"
- />
+ component=".applicationcontrol.applicationController"
+ provides="zope.traversing.interfaces.IEtcNamespace"
+ name="ApplicationController"
+ />
<!-- Include browser package -->
Modified: zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/interfaces.py
===================================================================
--- zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/interfaces.py 2009-12-20 04:54:19 UTC (rev 106801)
+++ zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/interfaces.py 2009-12-20 04:56:48 UTC (rev 106802)
@@ -31,7 +31,7 @@
"""Runtime Information Adapter for Application Control"""
def getDeveloperMode():
- """Return the current developer mode setting"""
+ """Return the current developer mode setting"""
def getPreferredEncoding():
"""Return the encoding used for text data, according
Modified: zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/runtimeinfo.py
===================================================================
--- zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/runtimeinfo.py 2009-12-20 04:54:19 UTC (rev 106801)
+++ zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/runtimeinfo.py 2009-12-20 04:56:48 UTC (rev 106802)
@@ -37,8 +37,12 @@
from zope.app.applicationcontrol.interfaces import IApplicationControl
from zope.app.applicationcontrol.interfaces import IZopeVersion
-from zope.app.appsetup import appsetup
+try:
+ from zope.app.appsetup import appsetup
+except ImportError:
+ appsetup = None
+
class RuntimeInfo(object):
"""Runtime information."""
@@ -50,10 +54,13 @@
def getDeveloperMode(self):
"""See zope.app.applicationcontrol.interfaces.IRuntimeInfo"""
+ if appsetup is None:
+ return 'undefined'
+
cc=appsetup.getConfigContext()
if cc == None: # make the test run
return 'undefined'
- if cc.hasFeature('devmode'):
+ if cc.hasFeature('devmode'):
return 'On'
return 'Off'
Modified: zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/testing.py
===================================================================
--- zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/testing.py 2009-12-20 04:54:19 UTC (rev 106801)
+++ zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/testing.py 2009-12-20 04:56:48 UTC (rev 106802)
@@ -24,4 +24,3 @@
ApplicationControlLayer = ZCMLLayer(
os.path.join(os.path.split(__file__)[0], 'ftesting.zcml'),
__name__, 'ApplicationControlLayer', allow_teardown=True)
-
Modified: zope.app.applicationcontrol/trunk/test.py
===================================================================
--- zope.app.applicationcontrol/trunk/test.py 2009-12-20 04:54:19 UTC (rev 106801)
+++ zope.app.applicationcontrol/trunk/test.py 2009-12-20 04:56:48 UTC (rev 106802)
@@ -38,4 +38,3 @@
]
sys.exit(testrunner.run(defaults))
-
More information about the checkins
mailing list