[commit] r1876 - in trunk/Tests/GPyUnit: . util

[GMESRC Repository Notifications]

Author: ksmyth
Date: Thu Mar 22 15:23:31 2012
New Revision: 1876

Log:
Fixes for Jython

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

Modified: trunk/Tests/GPyUnit/__init__.py
==============================================================================
--- trunk/Tests/GPyUnit/__init__.py	Thu Mar 22 15:23:18 2012	(r1875)
+++ trunk/Tests/GPyUnit/__init__.py	Thu Mar 22 15:23:31 2012	(r1876)
@@ -47,7 +47,8 @@
 def _tests():
     # print _test_names()
     # can't find tc2 with \python27\python -m GPyUnit if we don't do this
-    import GPyUnit.Regr.Mga.tc2
+    if platform.system() != 'Java':
+        import GPyUnit.Regr.Mga.tc2
     return unittest.defaultTestLoader.loadTestsFromNames(['GPyUnit.' + test for test in _test_names()])
 
 def run_xmlrunner(output_filename):

Modified: trunk/Tests/GPyUnit/util/__init__.py
==============================================================================
--- trunk/Tests/GPyUnit/util/__init__.py	Thu Mar 22 15:23:18 2012	(r1875)
+++ trunk/Tests/GPyUnit/util/__init__.py	Thu Mar 22 15:23:31 2012	(r1876)
@@ -20,7 +20,7 @@
     else:
         import platform
         # FIXME: does this work with 64bit Jython?
-        if '64bit' in platform.architecture():
+        if platform.system() != 'Java' and '64bit' in platform.architecture():
             return win32com.client.DispatchEx(progid, clsctx=CLSCTX_LOCAL_SERVER|CLSCTX_ACTIVATE_32_BIT_SERVER)
         return win32com.client.DispatchEx(progid)
 

Modified: trunk/Tests/GPyUnit/util/gme.py
==============================================================================
--- trunk/Tests/GPyUnit/util/gme.py	Thu Mar 22 15:23:18 2012	(r1875)
+++ trunk/Tests/GPyUnit/util/gme.py	Thu Mar 22 15:23:31 2012	(r1876)
@@ -13,11 +13,12 @@
 import itertools
 
 
-# Disable early binding: full of race conditions writing the cache files,
-# and changes the semantics since inheritance isn't handled correctly
-import win32com.client.gencache
-_savedGetClassForCLSID = win32com.client.gencache.GetClassForCLSID
-win32com.client.gencache.GetClassForCLSID = lambda x: None
+if platform.system() != 'Java':
+    # Disable early binding: full of race conditions writing the cache files,
+    # and changes the semantics since inheritance isn't handled correctly
+    import win32com.client.gencache
+    _savedGetClassForCLSID = win32com.client.gencache.GetClassForCLSID
+    win32com.client.gencache.GetClassForCLSID = lambda x: None
 
 # Elevation helpers
 def execute_elevated(*args):