[Python-checkins] python/dist/src/Lib unittest.py,1.14.4.1,1.14.4.2

[gvanrossum@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1:/tmp/cvs-serv4806

Modified Files:
      Tag: release22-maint
	unittest.py 
Log Message:
Backport 1.16: Fix printing plural (s or "").


Index: unittest.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/unittest.py,v
retrieving revision 1.14.4.1
retrieving revision 1.14.4.2
diff -C2 -d -r1.14.4.1 -r1.14.4.2
*** unittest.py	21 May 2002 03:50:49 -0000	1.14.4.1
--- unittest.py	10 Feb 2003 20:48:19 -0000	1.14.4.2
***************
*** 617,621 ****
          run = result.testsRun
          self.stream.writeln("Ran %d test%s in %.3fs" %
!                             (run, run == 1 and "" or "s", timeTaken))
          self.stream.writeln()
          if not result.wasSuccessful():
--- 617,621 ----
          run = result.testsRun
          self.stream.writeln("Ran %d test%s in %.3fs" %
!                             (run, run != 1 and "s" or "", timeTaken))
          self.stream.writeln()
          if not result.wasSuccessful():