Rev 4791: Merge the have-ctypes fixes in http://bazaar.launchpad.net/~jameinel/bzr/2.1.0b4-win32-test-suite

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.1.0b4-win32-test-suite

------------------------------------------------------------
revno: 4791 [merge]
revision-id: john at arbash-meinel.com-20091108005114-atq8p5sdnvjhjgp1
parent: john at arbash-meinel.com-20091108004156-n4dj0yv119dwsuzm
parent: john at arbash-meinel.com-20091108004825-7m8qpfscrp13k7bu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1.0b4-win32-test-suite
timestamp: Sat 2009-11-07 18:51:14 -0600
message:
  Merge the have-ctypes fixes
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
-------------- next part --------------
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2009-11-01 05:52:16 +0000
+++ b/bzrlib/tests/__init__.py	2009-11-08 00:48:25 +0000
@@ -4309,7 +4309,9 @@
             # Windows doesn't have os.kill, and we catch the SIGBREAK signal.
             # We trigger SIGBREAK via a Console api so we need ctypes to
             # access the function
-            if not have_ctypes:
+            try:
+                import ctypes
+            except OSError:
                 return False
         return True