comtypes 1.1.0__zip → 1.1.3__zip

{comtypes-1.1.0 → comtypes-1.1.3}/comtypes/patcher.py

@@ -9,8 +9,10 @@ class Patch(object):
     >>> class MyClass:
     ...     def __init__(self, param):
     ...         self.param = param
+    ...     def bar(self):
+    ...         print("orig bar")
 
-    To add attributes to MyClass, you can use MonkeyPatch:
+    To add attributes to MyClass, you can use Patch:
 
     >>> @Patch(MyClass)
     ... class JustANamespace:
@@ -22,6 +24,28 @@ class Patch(object):
 
     The namespace is assigned None, so there's no mistaking the purpose
     >>> JustANamespace
+
+    The patcher will replace the existing methods:
+
+    >>> @Patch(MyClass)
+    ... class SomeNamespace:
+    ...     def bar(self):
+    ...         print("replaced bar")
+    >>> ob = MyClass('foo')
+    >>> ob.bar()
+    replaced bar
+
+    But it will not replace methods if no_replace is indicated.
+
+    >>> @Patch(MyClass)
+    ... class AnotherNamespace:
+    ...     @no_replace
+    ...     def bar(self):
+    ...         print("candy bar")
+    >>> ob = MyClass('foo')
+    >>> ob.bar()
+    replaced bar
+
     """
 
     def __init__(self, target):
@@ -32,7 +56,7 @@ class Patch(object):
             if name in vars(ReferenceEmptyClass):
                 continue
             no_replace = getattr(value, '__no_replace', False)
-            if no_replace and hasattr(value, name):
+            if no_replace and hasattr(self.target, name):
                 continue
             setattr(self.target, name, value)
 

{comtypes-1.1.0 → comtypes-1.1.3}/comtypes/safearray.py

@@ -4,6 +4,8 @@ from ctypes import (POINTER, Structure, byref, cast, c_long, memmove, pointer,
                     sizeof)
 from comtypes import _safearray, IUnknown, com_interface_registry, npsupport
 from comtypes.patcher import Patch
+
+numpy = npsupport.numpy
 _safearray_type_cache = {}
 
 
@@ -150,9 +152,6 @@ def _make_safearray_type(itemtype):
         @classmethod
         def create_from_ndarray(cls, value, extra, lBound=0):
             from comtypes.automation import VARIANT
-            #c:/python25/lib/site-packages/numpy/ctypeslib.py
-            numpy = __import__("numpy.ctypeslib")
-
             # If processing VARIANT, makes sure the array type is correct.
             if cls._itemtype_ is VARIANT:
                 if value.dtype != npsupport.VARIANT_dtype:
@@ -223,9 +222,9 @@ def _make_safearray_type(itemtype):
             self._needsfree = True
             return self[0]
 
-        def __del__(self):
+        def __del__(self, _SafeArrayDestroy=_safearray.SafeArrayDestroy):
             if self._needsfree:
-                _safearray.SafeArrayDestroy(self)
+                _SafeArrayDestroy(self)
 
         def _get_size(self, dim):
             "Return the number of elements for dimension 'dim'"
@@ -308,10 +307,10 @@ def _make_safearray_type(itemtype):
                         # we can get the most speed-up.
                         # XXX Only try to convert types known to
                         #     numpy.ctypeslib.
-                        import numpy.ctypeslib
                         if (safearray_as_ndarray and self._itemtype_ in
                                 numpy.ctypeslib._typecodes.values()):
-                            arr = numpy.ctypeslib.as_array(ptr, (num_elements,))
+                            arr = numpy.ctypeslib.as_array(ptr,
+                                                           (num_elements,))
                             return arr.copy()
                         return ptr[:num_elements]
 
@@ -365,8 +364,6 @@ def _make_safearray_type(itemtype):
 
 def _ndarray_to_variant_array(value):
     """ Convert an ndarray to VARIANT_dtype array """
-    numpy = npsupport.numpy
-
     # Check that variant arrays are supported
     if npsupport.VARIANT_dtype is None:
         msg = "VARIANT ndarrays require NumPy 1.7 or newer."
@@ -390,7 +387,6 @@ def _datetime64_ndarray_to_variant_array(value):
     # since midnight 30 December 1899. Hours and minutes are represented as
     # fractional days.
     from comtypes.automation import VT_DATE
-    numpy = npsupport.numpy
     value = numpy.array(value, "datetime64[ns]")
     value = value - npsupport.com_null_date64
     # Convert to days

{comtypes-1.1.0 → comtypes-1.1.3}/comtypes/test/TestComServer.py

@@ -117,9 +117,8 @@ class TestComServer(
 
     _name = u"spam, spam, spam"
 
-    def ITestComServer__get_name(self, this, pname):
-        pname[0] = self._name
-        return S_OK
+    def _get_name(self):
+        return self._name
 
     def ITestComServer__set_name(self, this, name):
         self._name = name
@@ -139,7 +138,7 @@ class TestComServer(
 ##    HRESULT MixedInOut([in] int a, [out] int *b, [in] int c, [out] int *d);
     def MixedInOut(self, a, c):
         return a+1, c+1
-    
+
 if __name__ == "__main__":
     try:
         from comtypes.server.register import UseCommandLine

{comtypes-1.1.0 → comtypes-1.1.3}/comtypes/test/test_variant.py

@@ -176,6 +176,11 @@ class VariantTestCase(unittest.TestCase):
         v.vt = VT_BSTR
         self.failUnless(v.value in ("", None))
 
+    def test_empty_BSTR(self):
+        v = VARIANT()
+        v.value = ""
+        self.assertEqual(v.vt, VT_BSTR)
+
     def test_UDT(self):
         from comtypes.gen.TestComServerLib import MYCOLOR
         v = VARIANT(MYCOLOR(red=1.0, green=2.0, blue=3.0))

{comtypes-1.1.0 → comtypes-1.1.3}/comtypes/tools/codegenerator.py

@@ -2,12 +2,15 @@
 # libraries.
 import os
 import cStringIO
+import keyword
 from comtypes.tools import typedesc
 import comtypes.client
 import comtypes.client._generate
 
 version = "$Rev$"[6:-2]
 
+__warn_on_munge__ = __debug__
+
 
 class lcid(object):
     def __repr__(self):
@@ -345,6 +348,11 @@ class Generator(object):
     _enumvalues = 0
     def EnumValue(self, tp):
         value = int(tp.value)
+        if keyword.iskeyword(tp.name):
+            # XXX use logging!
+            if __warn_on_munge__:
+                print "# Fixing keyword as EnumValue for %s" % tp.name
+            tp.name += "_"
         print >> self.stream, \
               "%s = %d" % (tp.name, value)
         self.names.add(tp.name)

{comtypes-1.1.0 → comtypes-1.1.3}/comtypes/typeinfo.py

@@ -4,6 +4,7 @@
 # flags '..\tools\windows.xml -m comtypes -m comtypes.automation -w -r .*TypeLibEx -r .*TypeLib -o typeinfo.py'
 # then hacked manually
 import os
+import sys
 import weakref
 
 from ctypes import *
@@ -31,6 +32,8 @@ from comtypes.automation import WCHAR
 from comtypes.automation import WORD
 from comtypes.automation import tagVARIANT
 
+is_64_bit = sys.maxsize > 2**32
+
 BOOL = c_int
 HREFTYPE = DWORD
 INT = c_int
@@ -38,7 +41,9 @@ MEMBERID = DISPID
 OLECHAR = WCHAR
 PVOID = c_void_p
 SHORT = c_short
-ULONG_PTR = c_ulong
+# See https://msdn.microsoft.com/en-us/library/windows/desktop/aa383751(v=vs.85).aspx#ULONG_PTR  # noqa
+ULONG_PTR = c_uint64 if is_64_bit else c_ulong
+
 USHORT = c_ushort
 LPOLESTR = POINTER(OLECHAR)
 

{comtypes-1.1.0 → comtypes-1.1.3}/comtypes.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: comtypes
-Version: 1.1.0
+Version: 1.1.3
 Summary: Pure Python COM package
 Home-page: http://starship.python.net/crew/theller/comtypes
 Author: Thomas Heller

{comtypes-1.1.0 → comtypes-1.1.3}/comtypes.egg-info/SOURCES.txt

@@ -1,3 +1,6 @@
+CHANGES.txt
+LICENSE.txt
+MANIFEST.in
 README
 clear_comtypes_cache.py
 setup.py