[Python-checkins] python/dist/src/Lib unittest.py,1.17,1.18

[purcell@users.sourceforge.net]

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

Modified Files:
	unittest.py 
Log Message:
Fix to ensure consistent 'repr' and 'str' results between Python
versions, since 'repr(new_style_class) != repr(classic_class)'.
Suggested by Jeremy Hylton.



Index: unittest.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/unittest.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** unittest.py	8 Aug 2002 13:38:02 -0000	1.17
--- unittest.py	9 Aug 2002 09:46:23 -0000	1.18
***************
*** 47,51 ****
  __author__ = "Steve Purcell"
  __email__ = "stephen_purcell at yahoo dot com"
! __version__ = "#Revision: 1.45 $"[11:-2]
  
  import time
--- 47,51 ----
  __author__ = "Steve Purcell"
  __email__ = "stephen_purcell at yahoo dot com"
! __version__ = "#Revision: 1.46 $"[11:-2]
  
  import time
***************
*** 63,66 ****
--- 63,69 ----
  __metaclass__ = type
  
+ def _strclass(cls):
+     return "%s.%s" % (cls.__module__, cls.__name__)
+ 
  class TestResult:
      """Holder for test result information.
***************
*** 117,121 ****
      def __repr__(self):
          return "<%s run=%i errors=%i failures=%i>" % \
!                (self.__class__, self.testsRun, len(self.errors),
                  len(self.failures))
  
--- 120,124 ----
      def __repr__(self):
          return "<%s run=%i errors=%i failures=%i>" % \
!                (_strclass(self.__class__), self.testsRun, len(self.errors),
                  len(self.failures))
  
***************
*** 187,191 ****
  
      def id(self):
!         return "%s.%s" % (self.__class__, self.__testMethodName)
  
      def __str__(self):
--- 190,194 ----
  
      def id(self):
!         return "%s.%s" % (_strclass(self.__class__), self.__testMethodName)
  
      def __str__(self):
***************
*** 194,198 ****
      def __repr__(self):
          return "<%s testMethod=%s>" % \
!                (self.__class__, self.__testMethodName)
  
      def run(self, result=None):
--- 197,201 ----
      def __repr__(self):
          return "<%s testMethod=%s>" % \
!                (_strclass(self.__class__), self.__testMethodName)
  
      def run(self, result=None):
***************
*** 322,326 ****
  
      def __repr__(self):
!         return "<%s tests=%s>" % (self.__class__, self._tests)
  
      __str__ = __repr__
--- 325,329 ----
  
      def __repr__(self):
!         return "<%s tests=%s>" % (_strclass(self.__class__), self._tests)
  
      __str__ = __repr__
***************
*** 386,393 ****
  
      def __str__(self):
!         return "%s (%s)" % (self.__class__, self.__testFunc.__name__)
  
      def __repr__(self):
!         return "<%s testFunc=%s>" % (self.__class__, self.__testFunc)
  
      def shortDescription(self):
--- 389,396 ----
  
      def __str__(self):
!         return "%s (%s)" % (_strclass(self.__class__), self.__testFunc.__name__)
  
      def __repr__(self):
!         return "<%s testFunc=%s>" % (_strclass(self.__class__), self.__testFunc)
  
      def shortDescription(self):