[Zope-Checkins] CVS: Zope3/lib/python/Zope/Testing - dispatcher.py:1.3.90.1

Tres Seaver tseaver@zope.com
Tue, 12 Feb 2002 15:56:46 -0500


Update of /cvs-repository/Zope3/lib/python/Zope/Testing
In directory cvs.zope.org:/tmp/cvs-serv19744/Zope/Testing

Modified Files:
      Tag: Zope-3x-branch
	dispatcher.py 
Log Message:


  - Normalize file headers.

  - Fix violations of "80 character" rule.


=== Zope3/lib/python/Zope/Testing/dispatcher.py 1.3 => 1.3.90.1 ===
-# 
-# Zope Public License (ZPL) Version 1.0
-# -------------------------------------
-# 
-# Copyright (c) Digital Creations.  All rights reserved.
-# 
-# This license has been certified as Open Source(tm).
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# 
-# 1. Redistributions in source code must retain the above copyright
-#    notice, this list of conditions, and the following disclaimer.
-# 
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions, and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 
-# 3. Digital Creations requests that attribution be given to Zope
-#    in any manner possible. Zope includes a "Powered by Zope"
-#    button that is installed by default. While it is not a license
-#    violation to remove this button, it is requested that the
-#    attribution remain. A significant investment has been put
-#    into Zope, and this effort will continue if the Zope community
-#    continues to grow. This is one way to assure that growth.
-# 
-# 4. All advertising materials and documentation mentioning
-#    features derived from or use of this software must display
-#    the following acknowledgement:
-# 
-#      "This product includes software developed by Digital Creations
-#      for use in the Z Object Publishing Environment
-#      (http://www.zope.org/)."
-# 
-#    In the event that the product being advertised includes an
-#    intact Zope distribution (with copyright and license included)
-#    then this clause is waived.
-# 
-# 5. Names associated with Zope or Digital Creations must not be used to
-#    endorse or promote products derived from this software without
-#    prior written permission from Digital Creations.
-# 
-# 6. Modified redistributions of any form whatsoever must retain
-#    the following acknowledgment:
-# 
-#      "This product includes software developed by Digital Creations
-#      for use in the Z Object Publishing Environment
-#      (http://www.zope.org/)."
-# 
-#    Intact (re-)distributions of any official Zope release do not
-#    require an external acknowledgement.
-# 
-# 7. Modifications are encouraged but must be packaged separately as
-#    patches to official Zope releases.  Distributions that do not
-#    clearly separate the patches from the original work must be clearly
-#    labeled as unofficial distributions.  Modifications which do not
-#    carry the name Zope may be packaged in any form, as long as they
-#    conform to all of the clauses above.
-# 
-# 
-# Disclaimer
-# 
-#   THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY
-#   EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-#   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-#   PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL DIGITAL CREATIONS OR ITS
-#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-#   SUCH DAMAGE.
-# 
-# 
-# This software consists of contributions made by Digital Creations and
-# many individuals on behalf of Digital Creations.  Specific
-# attributions are listed in the accompanying credits file.
-# 
+#
+# Copyright (c) 2001 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
 ##############################################################################
+""" Dispatcher for usage inside Zope test environment
 
-# Dispatcher for usage inside Zope test environment
-# Andreas Jung, andreas@digicool.com 03/24/2001
+Andreas Jung, andreas@digicool.com 03/24/2001
 
-
-__version__ = '$Id$'
+$Id$
+"""
 
 
 import os,sys,re,string
@@ -158,7 +85,8 @@
             
             for i in range(0,numthreads):
                 kw['t_func'] = func
-                th = threading.Thread(None,self.worker,name="TH_%s_%03d" % (func,i) ,args=args,kwargs=kw)
+                th = threading.Thread(None,self.worker,
+                        name="TH_%s_%03d" % (func,i) ,args=args,kwargs=kw)
                 self._threads.append(th)
                 
         for th in self._threads: 			th.start()
@@ -170,16 +98,22 @@
         self.logn('Args: %s' % params)
         
         for th in self._threads:
-            self.logn( '%-30s ........................ %9.3f sec' % (th.getName(), self.runtime[th.getName()]) )
+            self.logn( '%-30s ........................ %9.3f sec'
+                        % (th.getName(), self.runtime[th.getName()]) )
             for k,v in self.th_data[th.getName()].items():
                 self.logn ('%-30s  %-15s = %s' % (' ',k,v) )
                 
                
         self.logn("") 
-        self.logn('Complete running time:                                  %9.3f sec' % (time.time()-self.start_test) )
+        self.logn(
+            'Complete running time:                                  %9.3f sec'
+                % (time.time()-self.start_test) )
         if len(self.mem_usage)>1: self.mem_usage.remove(-1)
-        self.logn( "Memory: start: %s, end: %s, low: %s, high: %s" %  \
-                        (s2s(self.mem_usage[0]),s2s(self.mem_usage[-1]),s2s(min(self.mem_usage)), s2s(max(self.mem_usage))))
+        self.logn( "Memory: start: %s, end: %s, low: %s, high: %s" % 
+                        (s2s(self.mem_usage[0]),
+                         s2s(self.mem_usage[-1]),
+                         s2s(min(self.mem_usage)),
+                         s2s(max(self.mem_usage))))
         self.logn('')
         
         
@@ -210,8 +144,9 @@
         """ famous last actions of thread """
         
         self.lock.acquire()
-        self.th_data[ threading.currentThread().getName() ]   = kw
-        self.runtime  [ threading.currentThread().getName() ] = time.time() - env['start']
+        self.th_data[ threading.currentThread().getName() ] = kw
+        self.runtime[ threading.currentThread().getName() ] = ( time.time()
+                                                              - env['start'] )
         self.lock.release()