Moving imports outside of running code. This makes creation of event-related

objects more thread-safe. See
http://docs.python.org/library/threading.html#importing-in-threaded-code.

--HG--
extra : convert_revision : svn%3Aa2f44796-8cc0-49ac-b43f-6a96d556d52d/trunk%40584

Author: cfarrow

comtypes/_comobject.py

@@ -12,7 +12,7 @@
 # COM object implementation
 from _ctypes import CopyComPointer
 
-from comtypes import COMError, ReturnHRESULT, instancemethod
+from comtypes import COMError, ReturnHRESULT, instancemethod, _encode_idl
 from comtypes.errorinfo import ISupportErrorInfo, ReportException, ReportError
 from comtypes.typeinfo import IProvideClassInfo, IProvideClassInfo2
 from comtypes import IPersist
@@ -466,7 +466,6 @@ def __make_dispentry(self,
         # We build a _dispmap_ entry now that maps invkind and
         # dispid to implementations that the finder finds;
         # IDispatch_Invoke will later call it.
-        from comtypes import _encode_idl
         paramflags = [((_encode_idl(x[0]), x[1]) + tuple(x[3:])) for x in argspec]
 
         dispid = idlflags[0] # XXX can the dispid be at a different index?  Check codegenerator.

comtypes/client/_events.py

@@ -5,6 +5,7 @@
 import comtypes.automation
 import comtypes.typeinfo
 import comtypes.connectionpoints
+from comtypes.client._generate import GetModule
 import logging
 logger = logging.getLogger(__name__)
 
@@ -48,7 +49,6 @@ def FindOutgoingInterface(source):
         except KeyError:
             tinfo = pci.GetClassInfo()
             tlib, index = tinfo.GetContainingTypeLib()
-            from comtypes.client import GetModule
             GetModule(tlib)
             interface = comtypes.com_interface_registry[str(guid)]
         logger.debug("%s using sinkinterface %s", source, interface)
@@ -243,7 +243,7 @@ def PumpEvents(timeout):
     # If the calling thread resides in a multithread apartment (MTA),
     # CoWaitForMultipleHandles calls the Win32 function
     # MsgWaitForMultipleObjects.
-    
+
     hevt = ctypes.windll.kernel32.CreateEventA(None, True, False, None)
     handles = (ctypes.c_void_p * 1)(hevt)
     RPC_S_CALLPENDING = -2147417835