[Psyco-checkins] CVS: psyco/test basetests.py,1.6,1.7 btrun.py,1.20,1.21 compactobject.py,1.3,1.4

[Armin R. <ar...@us...>]

Update of /cvsroot/psyco/psyco/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31937/test

Modified Files:
	basetests.py btrun.py compactobject.py 
Log Message:
Python 2.1 and 2.2 compatibility.


Index: basetests.py
===================================================================
RCS file: /cvsroot/psyco/psyco/test/basetests.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** basetests.py	26 Oct 2004 15:10:32 -0000	1.6
--- basetests.py	31 Dec 2004 13:55:18 -0000	1.7
***************
*** 25,29 ****
      tests = [(example.source, example.want, example.lineno)
               for example in examples]
!     
  PRELUDE = ''
  for inp, outp, line in tests[:]:
--- 25,37 ----
      tests = [(example.source, example.want, example.lineno)
               for example in examples]
! 
! # --- some tests can't run with Python 2.1
! 
! if sys.version_info < (2,2):
!     tests = [example for example in tests
!              if example[0].find('compactobject') < 0]
! 
! # ---
! 
  PRELUDE = ''
  for inp, outp, line in tests[:]:

Index: btrun.py
===================================================================
RCS file: /cvsroot/psyco/psyco/test/btrun.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** btrun.py	29 Dec 2004 21:33:05 -0000	1.20
--- btrun.py	31 Dec 2004 13:55:19 -0000	1.21
***************
*** 4,8 ****
  >>> import sys, uu, psyco
  >>> psyco.full()
! >>> import test1, test3, test5, compactobject
  
  >>> def prep():
--- 4,9 ----
  >>> import sys, uu, psyco
  >>> psyco.full()
! >>> import test1, test3, test5
! >>> import compactobject
  
  >>> def prep():

Index: compactobject.py
===================================================================
RCS file: /cvsroot/psyco/psyco/test/compactobject.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** compactobject.py	30 Dec 2004 09:09:54 -0000	1.3
--- compactobject.py	31 Dec 2004 13:55:19 -0000	1.4
***************
*** 176,181 ****
      assert Y.__bases__ == (psyco.compact,)
      assert Z.__bases__ == (X,)
!     Z.__bases__ = (Y,)
!     assert Z.__bases__ == (Y,)
  
  psyco.cannotcompile(test_inheritance)  # because of type mutation
--- 176,182 ----
      assert Y.__bases__ == (psyco.compact,)
      assert Z.__bases__ == (X,)
!     if sys.version >= (2,3):   # can't assign to __bases__ in Python 2.2
!         Z.__bases__ = (Y,)
!         assert Z.__bases__ == (Y,)
  
  psyco.cannotcompile(test_inheritance)  # because of type mutation