[pywin32-checkins] pywin32/adodbapi adodbapi.py, 1.1.1.1, 1.2 readme.txt, 1.1.1.1, 1.2

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

Update of /cvsroot/pywin32/pywin32/adodbapi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24504

Modified Files:
	adodbapi.py readme.txt 
Log Message:
adodbapi version 2.1.1
Bug fix so nextset() will work even if a result set is empty [Bob Kline]
Bug fix to call CoInintialize before calling Dispatch [Adam Vandenberg]
Cleanups to test routines



Index: adodbapi.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/adodbapi/adodbapi.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** adodbapi.py	4 Jan 2008 18:49:09 -0000	1.1.1.1
--- adodbapi.py	6 Aug 2008 16:18:06 -0000	1.2
***************
*** 1,3 ****
! """adodbapi v2.1 -  A python DB API 2.0 interface to Microsoft ADO
      
      Copyright (C) 2002  Henrik Ekelund
--- 1,3 ----
! """adodbapi v2.1.1 -  A python DB API 2.0 interface to Microsoft ADO
      
      Copyright (C) 2002  Henrik Ekelund
***************
*** 246,252 ****
      global verbose
      try:
-         conn=Dispatch('ADODB.Connection')
          if win32:
!             pythoncom.CoInitialize()                 #v2.1 Paj
      except:
          raise InterfaceError #Probably COM Error
--- 246,252 ----
      global verbose
      try:
          if win32:
!             pythoncom.CoInitialize()             #v2.1 Paj
!         conn=Dispatch('ADODB.Connection') #connect _after_ CoIninialize v2.1.1 adamvan
      except:
          raise InterfaceError #Probably COM Error
***************
*** 502,508 ****
          return retLst
  
!     def _makeDescriptionFromRS(self,rs):        
          if (rs == None) or (rs.State == adStateClosed): 
!             self.rs=None
              self.description=None
          else:
--- 502,509 ----
          return retLst
  
!     def _makeDescriptionFromRS(self,rs):
!         self.rs = rs        #v2.1.1 bkline
          if (rs == None) or (rs.State == adStateClosed): 
!             ##self.rs=None  #removed v2.1.1 bkline
              self.description=None
          else:
***************
*** 516,520 ****
              # and rowcount will then be set accurately [Cole]
              self.rowcount = -1
!             self.rs=rs
              nOfFields=rs.Fields.Count
              self.description=[]
--- 517,521 ----
              # and rowcount will then be set accurately [Cole]
              self.rowcount = -1
!             ##self.rs=rs #removed v2.1.1 bkline
              nOfFields=rs.Fields.Count
              self.description=[]
***************
*** 542,546 ****
          if self.rs and self.rs.State != adStateClosed: # rs exists and is open      #v2.1 Rose
              self.rs.Close()                                                         #v2.1 Rose
!             self.rs = None  #let go of the recordset os ADO will let it be disposed #v2.1 Rose
  
  # ------------------------
--- 543,547 ----
          if self.rs and self.rs.State != adStateClosed: # rs exists and is open      #v2.1 Rose
              self.rs.Close()                                                         #v2.1 Rose
!             self.rs = None  #let go of the recordset so ADO will let it be disposed #v2.1 Rose
  
  # ------------------------
***************
*** 741,745 ****
              self._raiseCursorError(Error,None)
              return
!         if rs == None:
              self._raiseCursorError(Error,None)
              return
--- 742,746 ----
              self._raiseCursorError(Error,None)
              return
!         if rs == None or rs.State == adStateClosed: #v2.1.1 bkline
              self._raiseCursorError(Error,None)
              return

Index: readme.txt
===================================================================
RCS file: /cvsroot/pywin32/pywin32/adodbapi/readme.txt,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** readme.txt	4 Jan 2008 18:49:09 -0000	1.1.1.1
--- readme.txt	6 Aug 2008 16:18:06 -0000	1.2
***************
*** 19,22 ****
--- 19,27 ----
  * (this version included within) Mark Hammond's win32all python for windows extensions. 
  
+ 
+ Whats new in version 2.1.1?
+ 1. Bugfix so nextset() will work even if a rowset is empty [ Bob Kline ]
+ 2. Bugfix to call CoInitailize() before calling Dispatch() [ Adam Vandenberg ]
+ 
  Whats new in version 2.1?
  1. Use of Decimal.decimal data type for currency and numeric data. [ Cole ]
***************
*** 64,68 ****
  LGPL, see http://www.opensource.org/licenses/lgpl-license.php
  
- 
  Documentation
  -------------
--- 69,72 ----
***************
*** 75,87 ****
  -------------
  The adodbapi mailing lists have been deactivated. Submit comments to the 
! bug tracker.
  
- Contribute
- ----------
- Use the sourceforge bug tracking system to submit bugs, feature requests
- and comments.
  
  Relase history
  --------------
  2.1	Python 2.4 version
  2.0     See what's new above.
--- 79,88 ----
  -------------
  The adodbapi mailing lists have been deactivated. Submit comments to the 
! pywin32 lists.
  
  
  Relase history
  --------------
+ 2.1.1	Bugfix to CoIninialize() and nextset()
  2.1	Python 2.4 version
  2.0     See what's new above.