[Python-checkins] CVS: python/dist/src/Lib/test test_support.py,1.20,1.21

Barry Warsaw bwarsaw@users.sourceforge.net
Fri, 23 Mar 2001 10:04:05 -0800


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

Modified Files:
	test_support.py 
Log Message:
In Jython, `@' is not allowed in module names.  Extend the TESTFN test
to use "$test" when in Jython.  Closes SF patch #403668.


Index: test_support.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_support.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** test_support.py	2001/03/23 04:21:17	1.20
--- test_support.py	2001/03/23 18:04:02	1.21
***************
*** 58,65 ****
  
  import os
! if os.name !='riscos':
!     TESTFN = '@test' # Filename used for testing
  else:
!     TESTFN = 'test' # Filename used for testing
  del os
  
--- 58,69 ----
  
  import os
! # Filename used for testing
! if os.name == 'java':
!     # Jython disallows @ in module names
!     TESTFN = '$test'
! elif os.name != 'riscos':
!     TESTFN = '@test'
  else:
!     TESTFN = 'test'
  del os