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

Fred L. Drake, Jr. fred@zope.com
Tue, 24 Dec 2002 01:43:17 -0500


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

Modified Files:
      Tag: NameGeddon-branch
	runtimeinfo.py 
Log Message:
- fixup import
- normalize whitespace


=== Zope3/src/zope/app/browser/applicationcontrol/runtimeinfo.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/browser/applicationcontrol/runtimeinfo.py:1.1.2.1	Mon Dec 23 14:30:59 2002
+++ Zope3/src/zope/app/browser/applicationcontrol/runtimeinfo.py	Tue Dec 24 01:43:17 2002
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (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.
-# 
+#
 ##############################################################################
 """Define runtime information view component for Application Control
 
@@ -18,15 +18,16 @@
 
 from zope.publisher.browser import BrowserView
 from zope.app.interfaces.applicationcontrol.runtimeinfo import IRuntimeInfo
-from Zope.App.PageTemplate import ViewPageTemplateFile
+from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
 from zope.component import getAdapter
 from zope.component import ComponentLookupError
 
+
 class RuntimeInfoView(BrowserView):
-    
+
     def runtimeInfo(self):
         formatted = {}  # will contain formatted runtime information
-        
+
         try:
             runtime_info = getAdapter(self.context, IRuntimeInfo)
         except ComponentLookupError:
@@ -40,7 +41,7 @@
             formatted['CommandLine'] = "N/A"
             formatted['ProcessId'] = "N/A"
             formatted['Hint'] = "Could not retrieve runtime information."
-        
+
         formatted['ZopeVersion'] = runtime_info.getZopeVersion()
         formatted['PythonVersion'] = runtime_info.getPythonVersion()
         formatted['PythonPath'] = runtime_info.getPythonPath()
@@ -52,7 +53,7 @@
         uptime = runtime_info.getUptime()
         days = int(uptime / (60*60*24))
         uptime = uptime - days * (60*60*24)
-        
+
         hours = int(uptime / (60*60))
         uptime = uptime - hours * (60*60)
 
@@ -64,5 +65,5 @@
             ((days or "") and "%d days, " % days), hours, minutes, seconds)
 
         return formatted
-        
+
     index = ViewPageTemplateFile('runtimeinfo.pt')