[Checkins] SVN: zamplugin.control/trunk/src/zamplugin/control/ -
Added missing configuration for IRuntimeInfo adapter, we don't
Roger Ineichen
roger at projekt01.ch
Fri Mar 14 06:14:00 EDT 2008
Log message for revision 84648:
- Added missing configuration for IRuntimeInfo adapter, we don't
load the zope configure.zcml because it configures the broken
ApplicationControl implementation.
- Fix missing PythonPath, return a tuple instead of a string
Note:
We really should fix all that in zope.app.applicationcontrol
rather then in this package.
Changed:
U zamplugin.control/trunk/src/zamplugin/control/browser/runtimeinfo.py
U zamplugin.control/trunk/src/zamplugin/control/configure.zcml
-=-
Modified: zamplugin.control/trunk/src/zamplugin/control/browser/runtimeinfo.py
===================================================================
--- zamplugin.control/trunk/src/zamplugin/control/browser/runtimeinfo.py 2008-03-14 10:09:06 UTC (rev 84647)
+++ zamplugin.control/trunk/src/zamplugin/control/browser/runtimeinfo.py 2008-03-14 10:13:59 UTC (rev 84648)
@@ -31,7 +31,6 @@
_fields = (
"ZopeVersion",
"PythonVersion",
- "PythonPath",
"SystemPlatform",
"PreferredEncoding",
"FileSystemEncoding",
@@ -47,6 +46,7 @@
except TypeError:
formatted = dict.fromkeys(self._fields, self._unavailable)
formatted["Uptime"] = self._unavailable
+ formatted["PythonPath"] = (self._unavailable,)
else:
formatted = self._getInfo(ri)
return formatted
@@ -60,6 +60,7 @@
value = self._unavailable
formatted[name] = value
formatted["Uptime"] = self._getUptime(ri)
+ formatted["PythonPath"] = ri.getPythonPath() or (self._unavailable,)
return formatted
def _getUptime(self, ri):
Modified: zamplugin.control/trunk/src/zamplugin/control/configure.zcml
===================================================================
--- zamplugin.control/trunk/src/zamplugin/control/configure.zcml 2008-03-14 10:09:06 UTC (rev 84647)
+++ zamplugin.control/trunk/src/zamplugin/control/configure.zcml 2008-03-14 10:13:59 UTC (rev 84648)
@@ -26,6 +26,22 @@
/>
</class>
+
+ <!-- configure zope defaults (we do not include original configure.zcml -->
+ <adapter
+ for="zope.app.applicationcontrol.interfaces.IApplicationControl"
+ provides="zope.app.applicationcontrol.interfaces.IRuntimeInfo"
+ factory="zope.app.applicationcontrol.runtimeinfo.RuntimeInfo"
+ permission="zope.ManageApplication"
+ />
+
+ <!-- configure zope defaults (we do not include original configure.zcml -->
+ <utility
+ component="zope.app.applicationcontrol.zopeversion.ZopeVersionUtility"
+ provides="zope.app.applicationcontrol.interfaces.IZopeVersion"
+ />
+
+ <!-- re-configure some crapy zope core components -->
<adapter
factory=".applicationcontrol.ApplicationControl"
provides="zope.app.applicationcontrol.interfaces.IApplicationControl"
More information about the Checkins
mailing list