[commit] r1788 - trunk/Tests/GPyUnit/util

Mon Jan 9 10:36:59 CST 2012

Author: ksmyth
Date: Mon Jan  9 10:36:59 2012
New Revision: 1788

Log:
Fix under x64 python

Modified:
   trunk/Tests/GPyUnit/util/__init__.py

Modified: trunk/Tests/GPyUnit/util/__init__.py
==============================================================================

--- trunk/Tests/GPyUnit/util/__init__.py	Fri Jan  6 17:33:34 2012	(r1787)
+++ trunk/Tests/GPyUnit/util/__init__.py	Mon Jan  9 10:36:59 2012	(r1788)
@@ -18,9 +18,11 @@
     if _opts.Dispatch_x64:
         return win32com.client.DispatchEx(progid, clsctx=CLSCTX_LOCAL_SERVER|CLSCTX_ACTIVATE_64_BIT_SERVER)
     else:
-        # FIXME: wrong on x64 python.exe
+        import platform
+        # FIXME: does this work with 64bit Jython?
+        if '64bit' in platform.architecture():
+            return win32com.client.DispatchEx(progid, clsctx=CLSCTX_LOCAL_SERVER|CLSCTX_ACTIVATE_32_BIT_SERVER)
         return win32com.client.DispatchEx(progid)
-        # This doesn't work on x86 python.exe on x86 Windows: return win32com.client.DispatchEx(progid, clsctx=CLSCTX_LOCAL_SERVER|CLSCTX_ACTIVATE_32_BIT_SERVER)
 
 class disable_early_binding(object):
 	def __enter__(self):
