[pywin32-checkins] pywin32/win32/test test_win32api.py, 1.13.2.1, 1.13.2.2 test_win32file.py, 1.13.2.1, 1.13.2.2

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/win32/test
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10646/win32/test

Modified Files:
      Tag: py3k
	test_win32api.py test_win32file.py 
Log Message:
Move to exception attributes.


Index: test_win32file.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/test/test_win32file.py,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -C2 -d -r1.13.2.1 -r1.13.2.2
*** test_win32file.py	29 Aug 2008 04:59:28 -0000	1.13.2.1
--- test_win32file.py	3 Oct 2008 01:09:55 -0000	1.13.2.2
***************
*** 178,183 ****
              raise RuntimeError("Expected close to fail!")
          except win32file.error as details:
!             hr, func, msg = details.args
!             self.failUnlessEqual(hr, winerror.ERROR_INVALID_HANDLE)
  
      def testCompletionPortsQueued(self):
--- 178,182 ----
              raise RuntimeError("Expected close to fail!")
          except win32file.error as details:
!             self.failUnlessEqual(details.winerror, winerror.ERROR_INVALID_HANDLE)
  
      def testCompletionPortsQueued(self):
***************
*** 491,495 ****
                  win32file.EncryptFile(fname)
              except win32file.error as details:
!                 if details.args[0] != winerror.ERROR_ACCESS_DENIED:
                      raise
                  print ("It appears this is not NTFS - cant encrypt/decrypt")
--- 490,494 ----
                  win32file.EncryptFile(fname)
              except win32file.error as details:
!                 if details.winerror != winerror.ERROR_ACCESS_DENIED:
                      raise
                  print ("It appears this is not NTFS - cant encrypt/decrypt")

Index: test_win32api.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/test/test_win32api.py,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -C2 -d -r1.13.2.1 -r1.13.2.2
*** test_win32api.py	29 Aug 2008 04:59:28 -0000	1.13.2.1
--- test_win32api.py	3 Oct 2008 01:09:55 -0000	1.13.2.2
***************
*** 145,149 ****
              win32file.CreateDirectoryW(fname, None)
          except win32api.error as details:
!             if details.args[0]!=winerror.ERROR_ALREADY_EXISTS:
                  raise
          try:
--- 145,149 ----
              win32file.CreateDirectoryW(fname, None)
          except win32api.error as details:
!             if details.winerror!=winerror.ERROR_ALREADY_EXISTS:
                  raise
          try:
***************
*** 153,157 ****
                  attr = win32api.GetFileAttributes(fname)
              except win32api.error as details:
!                 if details.args[0] != winerror.ERROR_FILENAME_EXCED_RANGE:
                      raise
          
--- 153,157 ----
                  attr = win32api.GetFileAttributes(fname)
              except win32api.error as details:
!                 if details.winerror != winerror.ERROR_FILENAME_EXCED_RANGE:
                      raise