[Zope3-checkins] CVS: Zope3/src/zope/app/applicationcontrol/browser - runtimeinfo.pt:1.3 runtimeinfo.py:1.4

[Dmitry Vasiliev]

Update of /cvs-repository/Zope3/src/zope/app/applicationcontrol/browser
In directory cvs.zope.org:/tmp/cvs-serv22226/browser

Modified Files:
	runtimeinfo.pt runtimeinfo.py 
Log Message:
RuntimeInfo changes:

- new method: getFileSystemEncoding()
- getPythonPath() now returns unicode strings


=== Zope3/src/zope/app/applicationcontrol/browser/runtimeinfo.pt 1.2 => 1.3 ===
--- Zope3/src/zope/app/applicationcontrol/browser/runtimeinfo.pt:1.2	Tue Mar 23 17:07:39 2004
+++ Zope3/src/zope/app/applicationcontrol/browser/runtimeinfo.pt	Wed Mar 24 06:13:14 2004
@@ -19,6 +19,14 @@
        <span tal:replace="runtime_info/SystemPlatform" />
      </li>
      <li>
+       <span i18n:translate="">Preferred encoding</span>:
+       <span tal:replace="runtime_info/PreferredEncoding" />
+     </li>
+     <li>
+       <span i18n:translate="">FileSytem encoding</span>:
+       <span tal:replace="runtime_info/FileSystemEncoding" />
+     </li>
+     <li>
        <span i18n:translate="">Command line</span>:
        <span tal:replace="runtime_info/CommandLine" />
      </li>


=== Zope3/src/zope/app/applicationcontrol/browser/runtimeinfo.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/applicationcontrol/browser/runtimeinfo.py:1.3	Tue Mar 23 08:35:07 2004
+++ Zope3/src/zope/app/applicationcontrol/browser/runtimeinfo.py	Wed Mar 24 06:13:14 2004
@@ -16,7 +16,6 @@
 $Id$
 """
 from zope.app.applicationcontrol.interfaces import IRuntimeInfo
-from zope.component import ComponentLookupError
 
 from zope.app.i18n import ZopeMessageIDFactory as _
 
@@ -31,6 +30,8 @@
             formatted['PythonVersion'] = runtime_info.getPythonVersion()
             formatted['PythonPath'] = runtime_info.getPythonPath()
             formatted['SystemPlatform'] = runtime_info.getSystemPlatform()
+            formatted['PreferredEncoding'] = runtime_info.getPreferredEncoding()
+            formatted['FileSystemEncoding'] = runtime_info.getFileSystemEncoding()
             formatted['CommandLine'] = runtime_info.getCommandLine()
             formatted['ProcessId'] = runtime_info.getProcessId()
 
@@ -48,7 +49,7 @@
 
             formatted['Uptime'] = uptime
 
-        except TypeError:
+        except (TypeError, UnicodeError):
             # We avoid having errors in the ApplicationController,
             # because all those things need to stay accessible.
             na = _("n/a")
@@ -56,6 +57,8 @@
             formatted['PythonVersion'] = na
             formatted['PythonPath'] = (na,)
             formatted['SystemPlatform'] = na
+            formatted['PreferredEncoding'] = na
+            formatted['FileSystemEncoding'] = na
             formatted['CommandLine'] = na
             formatted['ProcessId'] = na
             formatted['Uptime'] = na