[pywin32-checkins] pywin32/adodbapi/tests RunTests.bat, 1.2, 1.3 adodbapitest.py, 1.8, 1.9 dbapi20.py, 1.3, 1.4 test_adodbapi_dbapi20.py, 1.4, 1.5

[Vernon C. <kf...@us...>]

Update of /cvsroot/pywin32/pywin32/adodbapi/tests
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10319/tests

Modified Files:
	RunTests.bat adodbapitest.py dbapi20.py 
	test_adodbapi_dbapi20.py 
Log Message:
Tested okay with Python 3.0, includes last minute patches from Mark H.

Index: adodbapitest.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/adodbapi/tests/adodbapitest.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** adodbapitest.py	2 Feb 2009 03:48:41 -0000	1.8
--- adodbapitest.py	6 Feb 2009 03:35:11 -0000	1.9
***************
*** 44,47 ****
--- 44,52 ----
      import win32com.decimal_23 as decimal
  
+ def str2bytes(sval):
+     if sys.version_info < (3,0) and isinstance(sval, str):
+         sval = sval.decode("latin1")
+     return sval.encode("latin1")
+ 
  class CommonDBTests(unittest.TestCase):
      "Self contained super-simple tests in easy syntax, should work on everything between mySQL and Oracle"
***************
*** 249,253 ****
          if self.getEngine() != 'ACCESS':
              self.helpTestDataType("bit",'NUMBER',1) #Does not work correctly with access        
!             self.helpTestDataType("bigint",'NUMBER',3000000000L) 
  
      def testDataTypeChar(self):
--- 254,258 ----
          if self.getEngine() != 'ACCESS':
              self.helpTestDataType("bit",'NUMBER',1) #Does not work correctly with access        
!             self.helpTestDataType("bigint",'NUMBER',3000000000) 
  
      def testDataTypeChar(self):
***************
*** 275,280 ****
              pass #self.helpTestDataType("BLOB",'BINARY',adodbapi.Binary('\x00\x01\xE2\x40'))
          else:
!         # python 3.0 syntax -> binfld = b'\x00\x01\xE2\x40'
!             binfld = '\x00\x01\xE2\x40'
              self.helpTestDataType("binary(4)",'BINARY',adodbapi.Binary(binfld))
              self.helpTestDataType("varbinary(100)",'BINARY',adodbapi.Binary(binfld))
--- 280,284 ----
              pass #self.helpTestDataType("BLOB",'BINARY',adodbapi.Binary('\x00\x01\xE2\x40'))
          else:
!             binfld = str2bytes('\x00\x01\xE2\x40')
              self.helpTestDataType("binary(4)",'BINARY',adodbapi.Binary(binfld))
              self.helpTestDataType("varbinary(100)",'BINARY',adodbapi.Binary(binfld))

Index: test_adodbapi_dbapi20.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/adodbapi/tests/test_adodbapi_dbapi20.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test_adodbapi_dbapi20.py	2 Feb 2009 03:48:41 -0000	1.4
--- test_adodbapi_dbapi20.py	6 Feb 2009 03:35:11 -0000	1.5
***************
*** 4,8 ****
  import dbapi20
  import unittest
! import os, sys, string
  
  #attempt to find adodbapi in this directory's parent
--- 4,8 ----
  import dbapi20
  import unittest
! import os, sys
  
  #attempt to find adodbapi in this directory's parent
***************
*** 39,43 ****
  
      def testMethodName(self):
!         return string.split(self.id(),'.')[-1]
  
      def setUp(self):
--- 39,43 ----
  
      def testMethodName(self):
!         return self.id().split('.')[-1]
  
      def setUp(self):

Index: RunTests.bat
===================================================================
RCS file: /cvsroot/pywin32/pywin32/adodbapi/tests/RunTests.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RunTests.bat	11 Nov 2008 23:54:30 -0000	1.2
--- RunTests.bat	6 Feb 2009 03:35:11 -0000	1.3
***************
*** 1,2 ****
--- 1,5 ----
+ if not "%PYTHON%"=="" goto skip_python
+ set PYTHON=python
+ :skip_python
  Echo on
  echo .
***************
*** 5,30 ****
  echo .
  REM unit test
! adodbapitest.py
! echo .
! echo .
! REM generic test
! @echo .
! test_adodbapi_dbapi20.py
! echo .
! echo .
! db_print.py
! echo .
! del *.pyc
! del *.pyo
! del ..\adodbapi.pyc
! echo .
! call ipy.bat adodbapitest.py
  echo .
  echo .
  REM generic test
! @echo .
! call ipy.bat test_adodbapi_dbapi20.py
  echo .
- call ipy.bat db_print.py
  echo .
  pause Testing complete
--- 8,17 ----
  echo .
  REM unit test
! %PYTHON% adodbapitest.py
  echo .
  echo .
  REM generic test
! %PYTHON% test_adodbapi_dbapi20.py
  echo .
  echo .
  pause Testing complete

Index: dbapi20.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/adodbapi/tests/dbapi20.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dbapi20.py	2 Feb 2009 03:48:41 -0000	1.3
--- dbapi20.py	6 Feb 2009 03:35:11 -0000	1.4
***************
*** 12,16 ****
  '''
  
- __rcs_id__  = '$Id$'
  __version__ = '$Revision$'[11:-2]
  __author__ = 'Stuart Bishop <ze...@sh...>'
--- 12,15 ----
***************
*** 20,26 ****
  import sys
  
  # $Log$
! # Revision 1.3  2009/02/02 03:48:41  kf7xm
! # adodbapi v2.2.6 works with Python 3.0 (after 2to3)
  #
  # Revision 1.1.1.1.2.1  2008/09/20 19:54:59  rupole
--- 19,28 ----
  import sys
  
+ # Revision 3.0 2009/2/4 kf7xm
+ # Updates to make Python 3.0 compatible
+ #
  # $Log$
! # Revision 1.4  2009/02/06 03:35:11  kf7xm
! # Tested okay with Python 3.0, includes last minute patches from Mark H.
  #
  # Revision 1.1.1.1.2.1  2008/09/20 19:54:59  rupole
***************
*** 73,76 ****
--- 75,82 ----
  # - Fix bugs in test_setoutputsize_basic and test_setinputsizes
  #
+ def str2bytes(sval):
+     if sys.version_info < (3,0) and isinstance(sval, str):
+         sval = sval.decode("latin1")
+     return sval.encode("latin1")
  
  class DatabaseAPI20Test(unittest.TestCase):
***************
*** 836,841 ****
  
      def test_Binary(self):
!         b = self.driver.Binary('Something')
!         b = self.driver.Binary('')
  
      def test_STRING(self):
--- 842,847 ----
  
      def test_Binary(self):
!         b = self.driver.Binary(str2bytes('Something'))
!         b = self.driver.Binary(str2bytes(''))
  
      def test_STRING(self):