[Python-checkins] CVS: python/dist/src/Lib unittest.py,1.3,1.4

[Steve Purcell]

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

Modified Files:
	unittest.py 
Log Message:
* Remove exc_info() kludge -- it actually messed up the Jython output
* Fixed TestLoader.loadTestsFromName() for nested packages
* Corrected the command-line usage summary



Index: unittest.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/unittest.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** unittest.py	2001/03/29 04:36:08	1.3
--- unittest.py	2001/04/09 15:37:31	1.4
***************
*** 190,194 ****
                  self.setUp()
              except:
!                 result.addError(self,self.__exc_info())
                  return
  
--- 190,194 ----
                  self.setUp()
              except:
!                 result.addError(self,sys.exc_info())
                  return
  
***************
*** 198,209 ****
                  ok = 1
              except AssertionError, e:
!                 result.addFailure(self,self.__exc_info())
              except:
!                 result.addError(self,self.__exc_info())
  
              try:
                  self.tearDown()
              except:
!                 result.addError(self,self.__exc_info())
                  ok = 0
              if ok: result.addSuccess(self)
--- 198,209 ----
                  ok = 1
              except AssertionError, e:
!                 result.addFailure(self,sys.exc_info())
              except:
!                 result.addError(self,sys.exc_info())
  
              try:
                  self.tearDown()
              except:
!                 result.addError(self,sys.exc_info())
                  ok = 0
              if ok: result.addSuccess(self)
***************
*** 267,281 ****
          raise AssertionError, msg
  
-     def __exc_info(self):
-         """Return a version of sys.exc_info() with the traceback frame
-            minimised; usually the top level of the traceback frame is not
-            needed.
-         """
-         exctype, excvalue, tb = sys.exc_info()
-         newtb = tb.tb_next
-         if newtb is None:
-             return (exctype, excvalue, tb)
-         return (exctype, excvalue, newtb)
- 
  
  class TestSuite:
--- 267,270 ----
***************
*** 401,405 ****
                  raise ValueError, "incomplete test name: %s" % name
              else:
!                 module = __import__(parts)
                  parts = parts[1:]
          obj = module
--- 390,401 ----
                  raise ValueError, "incomplete test name: %s" % name
              else:
!                 parts_copy = parts[:]
!                 while parts_copy:
!                     try:
!                         module = __import__(string.join(parts_copy,'.'))
!                         break
!                     except ImportError:
!                         del parts_copy[-1]
!                         if not parts_copy: raise
                  parts = parts[1:]
          obj = module
***************
*** 600,604 ****
      """
      USAGE = """\
! Usage: %(progName)s [options] [test[:(casename|prefix-)]] [...]
  
  Options:
--- 596,600 ----
      """
      USAGE = """\
! Usage: %(progName)s [options] [test] [...]
  
  Options: