[pywin32-checkins] pywin32/com/win32comext/directsound/test ds_record.py, 1.1, 1.1.4.1 ds_test.py, 1.4, 1.4.4.1

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32/com/win32comext/directsound/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16802

Modified Files:
      Tag: py3k
	ds_record.py ds_test.py 
Log Message:
Convert tests to run under py3k

Index: ds_record.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/directsound/test/ds_record.py,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -C2 -d -r1.1 -r1.1.4.1
*** ds_record.py	7 Mar 2005 22:18:45 -0000	1.1
--- ds_record.py	7 Sep 2008 02:22:03 -0000	1.1.4.1
***************
*** 23,28 ****
  sdesc.lpwfxFormat.wBitsPerSample = 16
  
! print sdesc
! print d
  buffer = d.CreateCaptureBuffer(sdesc)
  
--- 23,28 ----
  sdesc.lpwfxFormat.wBitsPerSample = 16
  
! print (sdesc)
! print (d)
  buffer = d.CreateCaptureBuffer(sdesc)
  
***************
*** 41,42 ****
--- 41,43 ----
  f.write(wav_header_pack(sdesc.lpwfxFormat, 352800))
  f.write(data)
+ f.close()

Index: ds_test.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/directsound/test/ds_test.py,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C2 -d -r1.4 -r1.4.4.1
*** ds_test.py	7 Mar 2005 22:18:45 -0000	1.4
--- ds_test.py	7 Sep 2008 02:22:03 -0000	1.4.4.1
***************
*** 14,28 ****
  
  def wav_header_unpack(data):
      (riff, riffsize, wave, fmt, fmtsize, format, nchannels, samplespersecond, 
       datarate, blockalign, bitspersample, data, datalength) \
       = struct.unpack('<4sl4s4slhhllhh4sl', data)
  
!     if riff != 'RIFF':
!         raise ValueError, 'invalid wav header'
      
!     if fmtsize != 16 or fmt != 'fmt ' or data != 'data':
          # fmt chuck is not first chunk, directly followed by data chuck
          # It is nowhere required that they are, it is just very common
!         raise ValueError, 'cannot understand wav header'
  
      wfx = pywintypes.WAVEFORMATEX()
--- 14,29 ----
  
  def wav_header_unpack(data):
+     print (struct.unpack('<4sl4s4slhhllhh4sl', data))
      (riff, riffsize, wave, fmt, fmtsize, format, nchannels, samplespersecond, 
       datarate, blockalign, bitspersample, data, datalength) \
       = struct.unpack('<4sl4s4slhhllhh4sl', data)
  
!     if riff != b'RIFF':
!         raise ValueError('invalid wav header')
      
!     if fmtsize != 16 or fmt != b'fmt ' or data != b'data':
          # fmt chuck is not first chunk, directly followed by data chuck
          # It is nowhere required that they are, it is just very common
!         raise ValueError('cannot understand wav header')
  
      wfx = pywintypes.WAVEFORMATEX()
***************
*** 261,265 ****
      def testPlay(self):
          '''Mesdames et Messieurs, la cour de Devin Dazzle'''
!         fname=os.path.join(os.path.dirname(__file__), "01-Intro.wav")
          f = open(fname, 'rb')
          hdr = f.read(WAV_HEADER_SIZE)
--- 262,266 ----
      def testPlay(self):
          '''Mesdames et Messieurs, la cour de Devin Dazzle'''
!         fname=os.path.join(os.path.dirname(sys.argv[0]), "01-Intro.wav")
          f = open(fname, 'rb')
          hdr = f.read(WAV_HEADER_SIZE)