comtypes 1.1.1__zip → 1.1.3__zip

comtypes-1.1.3/LICENSE.txt

@@ -0,0 +1,24 @@
+This software is OSI Certified Open Source Software.
+OSI Certified is a certification mark of the Open Source Initiative.
+
+Copyright (c) 2006-2013, Thomas Heller.
+Copyright (c) 2014, Comtypes Developers.
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

comtypes-1.1.3/MANIFEST.in

@@ -0,0 +1 @@
+include *.txt

{comtypes-1.1.1 → comtypes-1.1.3}/PKG-INFO

@@ -1,52 +1,52 @@
-Metadata-Version: 1.1
-Name: comtypes
-Version: 1.1.1
-Summary: Pure Python COM package
-Home-page: http://starship.python.net/crew/theller/comtypes
-Author: Thomas Heller
-Author-email: theller@python.net
-License: MIT License
-Download-URL: https://github.com/enthought/comtypes/releases
-Description: comtypes
-        ========
-        
-        **comtypes** is a lightweight Python COM package, based on the ctypes_
-        FFI library, in less than 10000 lines of code (not counting the
-        tests).
-        
-        **comtypes** allows to define, call, and implement custom and
-        dispatch-based COM interfaces in pure Python.  It works on Windows,
-        64-bit Windows, and Windows CE.
-        
-        Documentation:
-        
-            https://pythonhosted.org/comtypes
-        
-            Contribute using the `source repository and issue tracker
-            <https://github.com/enthought/comtypes/>`_ on GitHub.
-        
-        Mailing list:
-        
-            http://gmane.org/info.php?group=gmane.comp.python.comtypes.user
-        
-            https://lists.sourceforge.net/lists/listinfo/comtypes-users/
-        
-        Download:
-        
-            Releases can be downloaded in the PyPI page:
-        
-            https://pypi.python.org/pypi/comtypes
-        
-        .. _ctypes: http://docs.python.org/lib/module-ctypes.html
-        
-Platform: UNKNOWN
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: Microsoft :: Windows
-Classifier: Operating System :: Microsoft :: Windows :: Windows CE
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2.6
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Metadata-Version: 1.1
+Name: comtypes
+Version: 1.1.3
+Summary: Pure Python COM package
+Home-page: http://starship.python.net/crew/theller/comtypes
+Author: Thomas Heller
+Author-email: theller@python.net
+License: MIT License
+Download-URL: https://github.com/enthought/comtypes/releases
+Description: comtypes
+        ========
+        
+        **comtypes** is a lightweight Python COM package, based on the ctypes_
+        FFI library, in less than 10000 lines of code (not counting the
+        tests).
+        
+        **comtypes** allows to define, call, and implement custom and
+        dispatch-based COM interfaces in pure Python.  It works on Windows,
+        64-bit Windows, and Windows CE.
+        
+        Documentation:
+        
+            https://pythonhosted.org/comtypes
+        
+            Contribute using the `source repository and issue tracker
+            <https://github.com/enthought/comtypes/>`_ on GitHub.
+        
+        Mailing list:
+        
+            http://gmane.org/info.php?group=gmane.comp.python.comtypes.user
+        
+            https://lists.sourceforge.net/lists/listinfo/comtypes-users/
+        
+        Download:
+        
+            Releases can be downloaded in the PyPI page:
+        
+            https://pypi.python.org/pypi/comtypes
+        
+        .. _ctypes: http://docs.python.org/lib/module-ctypes.html
+        
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Operating System :: Microsoft :: Windows :: Windows CE
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3
+Classifier: Topic :: Software Development :: Libraries :: Python Modules

{comtypes-1.1.1 → comtypes-1.1.3}/comtypes/__init__.py

@@ -2,8 +2,8 @@ import types
 import sys
 import os
 
-# comtypes version numbers follow semver (http://semver.org/)
-__version__ = "1.1.1"
+# comtypes version numbers follow semver (http://semver.org/) and PEP 440
+__version__ = "1.1.3"
 
 import logging
 class NullHandler(logging.Handler):
@@ -653,6 +653,11 @@ class _cominterface_meta(type):
                     outnum += 1
 
             rescode = func(self_, *args, **kw)
+            # If there is only a single output value, then do not expect it to
+            # be iterable.
+            if len(outargs) == 1:  # rescode is not iterable
+                return rescode.__ctypes_from_outparam__()
+
             rescode = list(rescode)
             for outnum, o in outargs.items():
                 rescode[outnum] = o.__ctypes_from_outparam__()

{comtypes-1.1.1 → comtypes-1.1.3}/comtypes/automation.py

@@ -858,6 +858,9 @@ _ctype_to_vartype = {
     # such an array cannot be created.
     POINTER(VARIANT): VT_BYREF|VT_VARIANT,
 
+    # This is needed to import Esri ArcObjects (esriSystem.olb).
+    POINTER(BSTR): VT_BYREF|VT_BSTR,
+
     # These are not yet implemented:
 ##    POINTER(IUnknown): VT_UNKNOWN,
 ##    POINTER(IDispatch): VT_DISPATCH,

{comtypes-1.1.1 → comtypes-1.1.3}/comtypes/client/_code_cache.py

@@ -108,7 +108,7 @@ def _is_writeable(path):
         return False
     try:
         tempfile.TemporaryFile(dir=path[0])
-    except OSError, details:
+    except (OSError, IOError), details:
         logger.debug("Path is unwriteable: %s", details)
         return False
     return True

{comtypes-1.1.1 → comtypes-1.1.3}/comtypes/npsupport.py

@@ -11,6 +11,7 @@ HAVE_NUMPY = numpy is not None
 
 is_64bits = sys.maxsize > 2**32
 
+
 def _make_variant_dtype():
     """ Create a dtype for VARIANT. This requires support for Unions, which is
     available in numpy version 1.7 or greater.
@@ -32,14 +33,14 @@ def _make_variant_dtype():
     # overlapping typecodes only allowed in numpy version 1.7 or greater
     U_VARIANT_format = dict(
         names=[
-        'VT_BOOL', 'VT_I1', 'VT_I2', 'VT_I4', 'VT_I8', 'VT_INT', 'VT_UI1',
-        'VT_UI2', 'VT_UI4', 'VT_UI8', 'VT_UINT', 'VT_R4', 'VT_R8', 'VT_CY',
-        'c_wchar_p', 'c_void_p', 'pparray', 'bstrVal', '_tagBRECORD',
+            'VT_BOOL', 'VT_I1', 'VT_I2', 'VT_I4', 'VT_I8', 'VT_INT', 'VT_UI1',
+            'VT_UI2', 'VT_UI4', 'VT_UI8', 'VT_UINT', 'VT_R4', 'VT_R8', 'VT_CY',
+            'c_wchar_p', 'c_void_p', 'pparray', 'bstrVal', '_tagBRECORD',
         ],
         formats=[
-        '<i2', '<i1', '<i2', '<i4', '<i8', '<i4', '<u1', '<u2', '<u4', '<u8',
-        '<u4', '<f4', '<f8', '<i8', ptr_typecode, ptr_typecode, ptr_typecode,
-        ptr_typecode, _tagBRECORD_format,
+            '<i2', '<i1', '<i2', '<i4', '<i8', '<i4', '<u1', '<u2', '<u4',
+            '<u8', '<u4', '<f4', '<f8', '<i8', ptr_typecode, ptr_typecode,
+            ptr_typecode, ptr_typecode, _tagBRECORD_format,
         ],
         offsets=[0] * 19  # This is what makes it a union
     )
@@ -77,6 +78,10 @@ def isdatetime64(value):
     return isinstance(value, datetime64)
 
 
+com_null_date64 = None
+datetime64 = None
+VARIANT_dtype = None
+
 if HAVE_NUMPY:
 
     # dtype for VARIANT. This allows for packing of variants into an array, and
@@ -84,18 +89,16 @@ if HAVE_NUMPY:
     try:
         VARIANT_dtype = _make_variant_dtype()
     except ValueError:
-        VARIANT_dtype = None
+        pass
 
     # This simplifies dependent modules
     try:
         from numpy import datetime64
     except ImportError:
-        datetime64 = None
-        com_null_date64 = None
+        pass
     else:
-        com_null_date64 = datetime64("1899-12-30T00:00:00", "ns")
-
-else:
-
-    VARIANT_dtype = None
-    datetime64 = None
+        try:
+            # This does not work on numpy 1.6
+            com_null_date64 = datetime64("1899-12-30T00:00:00", "ns")
+        except TypeError:
+            pass

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

@@ -222,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'"

{comtypes-1.1.1 → 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.1 → 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.1 → comtypes-1.1.3}/comtypes.egg-info/PKG-INFO

@@ -1,52 +1,52 @@
-Metadata-Version: 1.1
-Name: comtypes
-Version: 1.1.1
-Summary: Pure Python COM package
-Home-page: http://starship.python.net/crew/theller/comtypes
-Author: Thomas Heller
-Author-email: theller@python.net
-License: MIT License
-Download-URL: https://github.com/enthought/comtypes/releases
-Description: comtypes
-        ========
-        
-        **comtypes** is a lightweight Python COM package, based on the ctypes_
-        FFI library, in less than 10000 lines of code (not counting the
-        tests).
-        
-        **comtypes** allows to define, call, and implement custom and
-        dispatch-based COM interfaces in pure Python.  It works on Windows,
-        64-bit Windows, and Windows CE.
-        
-        Documentation:
-        
-            https://pythonhosted.org/comtypes
-        
-            Contribute using the `source repository and issue tracker
-            <https://github.com/enthought/comtypes/>`_ on GitHub.
-        
-        Mailing list:
-        
-            http://gmane.org/info.php?group=gmane.comp.python.comtypes.user
-        
-            https://lists.sourceforge.net/lists/listinfo/comtypes-users/
-        
-        Download:
-        
-            Releases can be downloaded in the PyPI page:
-        
-            https://pypi.python.org/pypi/comtypes
-        
-        .. _ctypes: http://docs.python.org/lib/module-ctypes.html
-        
-Platform: UNKNOWN
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: Microsoft :: Windows
-Classifier: Operating System :: Microsoft :: Windows :: Windows CE
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2.6
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Metadata-Version: 1.1
+Name: comtypes
+Version: 1.1.3
+Summary: Pure Python COM package
+Home-page: http://starship.python.net/crew/theller/comtypes
+Author: Thomas Heller
+Author-email: theller@python.net
+License: MIT License
+Download-URL: https://github.com/enthought/comtypes/releases
+Description: comtypes
+        ========
+        
+        **comtypes** is a lightweight Python COM package, based on the ctypes_
+        FFI library, in less than 10000 lines of code (not counting the
+        tests).
+        
+        **comtypes** allows to define, call, and implement custom and
+        dispatch-based COM interfaces in pure Python.  It works on Windows,
+        64-bit Windows, and Windows CE.
+        
+        Documentation:
+        
+            https://pythonhosted.org/comtypes
+        
+            Contribute using the `source repository and issue tracker
+            <https://github.com/enthought/comtypes/>`_ on GitHub.
+        
+        Mailing list:
+        
+            http://gmane.org/info.php?group=gmane.comp.python.comtypes.user
+        
+            https://lists.sourceforge.net/lists/listinfo/comtypes-users/
+        
+        Download:
+        
+            Releases can be downloaded in the PyPI page:
+        
+            https://pypi.python.org/pypi/comtypes
+        
+        .. _ctypes: http://docs.python.org/lib/module-ctypes.html
+        
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Operating System :: Microsoft :: Windows :: Windows CE
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3
+Classifier: Topic :: Software Development :: Libraries :: Python Modules

{comtypes-1.1.1 → 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

{comtypes-1.1.1 → comtypes-1.1.3}/setup.cfg

@@ -1,5 +1,5 @@
-[egg_info]
-tag_build = 
-tag_date = 0
-tag_svn_revision = 0
-
+[egg_info]
+tag_build = 
+tag_date = 0
+tag_svn_revision = 0
+