[Zope3-checkins] CVS: Zope3/src/zope/app/applicationcontrol/tests - test_applicationcontrol.py:1.1.2.2 test_iservercontrol.py:1.1.2.2 test_runtimeinfo.py:1.1.2.2 test_zopeversion.py:1.1.2.3

Tim Peters tim.one@comcast.net
Tue, 24 Dec 2002 21:21:40 -0500


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

Modified Files:
      Tag: NameGeddon-branch
	test_applicationcontrol.py test_iservercontrol.py 
	test_runtimeinfo.py test_zopeversion.py 
Log Message:
Whitespace normalization, via Python's Tools/scripts/reindent.py.  The
files are fixed-points of that script now.  Fixed a few cases where
code relied on significant trailing whitespace (ouch).


=== Zope3/src/zope/app/applicationcontrol/tests/test_applicationcontrol.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/applicationcontrol/tests/test_applicationcontrol.py:1.1.2.1	Mon Dec 23 14:30:57 2002
+++ Zope3/src/zope/app/applicationcontrol/tests/test_applicationcontrol.py	Tue Dec 24 21:20:09 2002
@@ -2,7 +2,7 @@
 #
 # 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
@@ -52,7 +52,7 @@
     def test_startTime(self):
         assert_time = time.time()
         test_time = self._Test__new().getStartTime()
-        
+
         self.failUnless(abs(assert_time - test_time) < time_tolerance)
 
 


=== Zope3/src/zope/app/applicationcontrol/tests/test_iservercontrol.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/applicationcontrol/tests/test_iservercontrol.py:1.1.2.1	Mon Dec 23 14:30:57 2002
+++ Zope3/src/zope/app/applicationcontrol/tests/test_iservercontrol.py	Tue Dec 24 21:20:09 2002
@@ -2,7 +2,7 @@
 #
 # 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
@@ -56,7 +56,7 @@
         # Try to register a noncallable object
         self.assertRaises(NotCallableError,
               server_control.registerShutdownHook, None, 10, "test")
-        
+
         # Try to register a priority for a second time
         server_control.registerShutdownHook(stub_callback, 10, "Test")
         self.assertRaises(DoublePriorityError,


=== Zope3/src/zope/app/applicationcontrol/tests/test_runtimeinfo.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/applicationcontrol/tests/test_runtimeinfo.py:1.1.2.1	Mon Dec 23 14:30:57 2002
+++ Zope3/src/zope/app/applicationcontrol/tests/test_runtimeinfo.py	Tue Dec 24 21:20:09 2002
@@ -2,7 +2,7 @@
 #
 # 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
@@ -58,7 +58,7 @@
 
         # we expect that there is no utility
         self.assertEqual(runtime_info.getZopeVersion(), "")
-        
+
         getService(None,'Utilities').provideUtility(IZopeVersion,
                                                TestZopeVersion())
         self.assertEqual(runtime_info.getZopeVersion(),
@@ -86,12 +86,12 @@
         runtime_info = self._Test__new()
         # whats the uptime we expect?
 
-        start_time = applicationController.getStartTime()       
+        start_time = applicationController.getStartTime()
         asserted_uptime = time.time() - start_time
 
         # get the uptime the current implementation calculates
         test_uptime = runtime_info.getUptime()
-        
+
         self.failUnless(abs(asserted_uptime - test_uptime) < time_tolerance)
 
 def test_suite():


=== Zope3/src/zope/app/applicationcontrol/tests/test_zopeversion.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/applicationcontrol/tests/test_zopeversion.py:1.1.2.2	Tue Dec 24 07:50:45 2002
+++ Zope3/src/zope/app/applicationcontrol/tests/test_zopeversion.py	Tue Dec 24 21:20:09 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.
-# 
+#
 ##############################################################################
 """
 
@@ -37,39 +37,39 @@
 #############################################################################
 
 class Test(TestCase):
-    
+
     def _Test__new(self):
         return ZopeVersion()
-        
+
     def _getZopeVersion(self):
         """example zope version implementation
         """
         version_id = "Development/Unknown"
         version_tag = ""
         is_cvs = 0
-        
+
         import zope
         zopedir = os.path.dirname(zope.__file__)
-        
+
         # is this a CVS checkout?
         cvsdir = os.path.join(zopedir, "CVS" )
         if os.path.isdir(cvsdir):
             is_cvs = 1
             tagfile = os.path.join(cvsdir, "Tag")
-            
+
             # get the tag information
             if os.path.isfile(tagfile):
                 f = open(tagfile)
                 tag = f.read()
                 if tag.startswith("T"):
                     version_tag = " (%s)" % tag[1:-1]
-        
+
         # try to get official Zope release information
         versionfile = os.path.join(zopedir, "version.txt")
         if os.path.isfile(versionfile) and not is_cvs:
             f = open(versionfile)
             version_id = f.read().split("\n")[0]
-            
+
         version = "%s%s" % (version_id, version_tag)
         return version
 
@@ -80,7 +80,7 @@
         zope_version = self._Test__new()
         self.assertEqual(zope_version.getZopeVersion(), self._getZopeVersion())
 
-        
+
 
 def test_suite():
     return makeSuite(Test)