Restore Python2.7 support without 2to3 fixer + timestamping fix (#259)

* Restore Python2.7 support without 2to3 fixer

* Fix faulty logic about timestamping

* Amend release notes, add copyright for metaclass decorator

* Fix IndexError for empty safearray

Co-authored-by: fusentasticus <[email protected]>
Co-authored-by: Bence Balogh <[email protected]>

Author: 3 people

CHANGES.txt

@@ -3,9 +3,11 @@ Comtypes CHANGELOG
 
 Release 1.1.11
 -------------
- * Fix Python 3 compatibility. Thanks @kdschlosser.
- * Fix `tlib_mtime` in the absence of typelib.
+ * Fix setuptools>=60.0.0 compatibility. Thanks @kdschlosser.
+ * Fix timestamping for typelib. Thanks @fusentasticus.
  * Fix 64bit inproc server.
+ * Drop Python 2.6 support.
+ * Fix IndexError for empty safearray. Thanks @BALOGHBence.
 
 Release 1.1.10
 -------------

appveyor.yml

@@ -1,4 +1,4 @@
-image: Visual Studio 2015
+image: Visual Studio 2022
 build: off
 max_jobs: 3
 
@@ -9,8 +9,6 @@ shallow_clone: true
 
 environment:
    matrix:
-     - py: Python26
-     - py: Python26-x64
      - py: Python27
      - py: Python27-x64
      - py: Python33
@@ -21,6 +19,10 @@ environment:
      - py: Python35-x64
      - py: Python36
      - py: Python36-x64
+     - py: Python39
+     - py: Python39-x64
+     - py: Python310
+     - py: Python310-x64
 
 test_script:
    - C:\%py%\python.exe setup.py install

comtypes/GUID.py

@@ -8,6 +8,13 @@ def binary(obj):
     def binary(obj):
         return buffer(obj)
 
+if sys.version_info >= (3, 0):
+    text_type = str
+    base_text_type = str
+else:
+    text_type = unicode
+    base_text_type = basestring
+
 BYTE = c_byte
 WORD = c_ushort
 DWORD = c_ulong
@@ -32,10 +39,10 @@ class GUID(Structure):
 
     def __init__(self, name=None):
         if name is not None:
-            _CLSIDFromString(str(name), byref(self))
+            _CLSIDFromString(text_type(name), byref(self))
 
     def __repr__(self):
-        return 'GUID("%s")' % str(self)
+        return 'GUID("%s")' % text_type(self)
 
     def __unicode__(self):
         p = c_wchar_p()
@@ -62,7 +69,7 @@ def __hash__(self):
         return hash(binary(self))
 
     def copy(self):
-        return GUID(str(self))
+        return GUID(text_type(self))
 
     def from_progid(cls, progid):
         """Get guid from progid, ...
@@ -71,11 +78,11 @@ def from_progid(cls, progid):
             progid = progid._reg_clsid_
         if isinstance(progid, cls):
             return progid
-        elif isinstance(progid, str):
+        elif isinstance(progid, base_text_type):
             if progid.startswith("{"):
                 return cls(progid)
             inst = cls()
-            _CLSIDFromProgID(str(progid), byref(inst))
+            _CLSIDFromProgID(text_type(progid), byref(inst))
             return inst
         else:
             raise TypeError("Cannot construct guid from %r" % progid)

comtypes/__init__.py

@@ -5,6 +5,11 @@
 # comtypes version numbers follow semver (http://semver.org/) and PEP 440
 __version__ = "1.1.11"
 
+if sys.version_info >= (3, 0):
+    text_type = str
+else:
+    text_type = unicode
+
 import logging
 class NullHandler(logging.Handler):
     """A Handler that does nothing."""
@@ -488,7 +493,7 @@ def _make_dispmethods(self, methods):
                 if is_prop:
                     self.__map_case__[name[5:].lower()] = name[5:]
 
-        for (name, nargs), methods in list(properties.items()):
+        for (name, nargs), methods in properties.items():
             # methods contains [propget or None, propput or None, propputref or None]
             if methods[1] is not None and methods[2] is not None:
                 # both propput and propputref.
@@ -655,7 +660,7 @@ def call_with_inout(self_, *args, **kw):
                 return rescode
 
             rescode = list(rescode)
-            for outnum, o in list(outargs.items()):
+            for outnum, o in outargs.items():
                 rescode[outnum] = o.__ctypes_from_outparam__()
             return rescode
         return call_with_inout
@@ -670,7 +675,7 @@ def _make_methods(self, methods):
         except KeyError:
             raise AttributeError("this class must define an _iid_")
         else:
-            iid = str(iid)
+            iid = text_type(iid)
 ##            if iid in com_interface_registry:
 ##                # Warn when multiple interfaces are defined with identical iids.
 ##                # This would also trigger if we reload() a module that contains
@@ -779,7 +784,7 @@ def _make_methods(self, methods):
                     self.__map_case__[name[5:].lower()] = name[5:]
 
         # create public properties / attribute accessors
-        for (name, doc, nargs), methods in list(properties.items()):
+        for (name, doc, nargs), methods in properties.items():
             # methods contains [propget or None, propput or None, propputref or None]
             if methods[1] is not None and methods[2] is not None:
                 # both propput and propputref.
@@ -891,11 +896,51 @@ def __repr__(self):
 
 ################################################################
 
+def add_metaclass(metaclass):
+    """Class decorator from six.py for creating a class with a metaclass.
+
+    Copyright (c) 2010-2020 Benjamin Peterson
+
+    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.
+    """
+    def wrapper(cls):
+        orig_vars = cls.__dict__.copy()
+        slots = orig_vars.get('__slots__')
+        if slots is not None:
+            if isinstance(slots, text_type):
+                slots = [slots]
+            for slots_var in slots:
+                orig_vars.pop(slots_var)
+        orig_vars.pop('__dict__', None)
+        orig_vars.pop('__weakref__', None)
+        if hasattr(cls, '__qualname__'):
+            orig_vars['__qualname__'] = cls.__qualname__
+        return metaclass(cls.__name__, cls.__bases__, orig_vars)
+    return wrapper
+
+################################################################
+
 class _compointer_meta(type(c_void_p), _cominterface_meta):
     "metaclass for COM interface pointer classes"
     # no functionality, but needed to avoid a metaclass conflict
 
-class _compointer_base(c_void_p, metaclass=_compointer_meta):
+@add_metaclass(_compointer_meta)
+class _compointer_base(c_void_p):
     "base class for COM interface pointer classes"
     def __del__(self, _debug=logger.debug):
         "Release the COM refcount we own."
@@ -1016,7 +1061,7 @@ def from_param(cls, value):
 ################################################################
 # IDL stuff
 
-class helpstring(str):
+class helpstring(text_type):
     "Specifies the helpstring for a COM method or property."
 
 class defaultvalue(object):
@@ -1122,7 +1167,8 @@ def COMMETHOD(idlflags, restype, methodname, *argspec):
 ################################################################
 # IUnknown, the root of all evil...
 
-class IUnknown(object, metaclass=_cominterface_meta):
+@add_metaclass(_cominterface_meta)
+class IUnknown(object):
     """The most basic COM interface.
 
     Each subclasses of IUnknown must define these class attributes:
@@ -1200,7 +1246,7 @@ def CoGetObject(displayname, interface):
         interface = IUnknown
     punk = POINTER(interface)()
     # Do we need a way to specify the BIND_OPTS parameter?
-    _ole32.CoGetObject(str(displayname),
+    _ole32.CoGetObject(text_type(displayname),
                        None,
                        byref(interface._iid_),
                        byref(punk))
@@ -1379,6 +1425,7 @@ def CoCreateInstanceEx(clsid, interface=None,
 
 from comtypes._meta import _coclass_meta
 
-class CoClass(COMObject, metaclass=_coclass_meta):
+@add_metaclass(_coclass_meta)
+class CoClass(COMObject):
     pass
 ################################################################

comtypes/_comobject.py

@@ -5,6 +5,7 @@
 from _ctypes import CopyComPointer
 import logging
 import os
+import sys
 
 from comtypes import COMError, ReturnHRESULT, instancemethod, _encode_idl
 from comtypes.errorinfo import ISupportErrorInfo, ReportException, ReportError
@@ -21,6 +22,11 @@
 _warning = logger.warning
 _error = logger.error
 
+if sys.version_info >= (3, 0):
+    int_types = (int, )
+else:
+    int_types = (int, long)
+
 ################################################################
 # COM object implementation
 
@@ -51,7 +57,7 @@ def winerror(exc):
         return exc.hresult
     elif isinstance(exc, WindowsError):
         code = exc.winerror
-        if isinstance(code, int):
+        if isinstance(code, int_types):
             return code
         # Sometimes, a WindowsError instance has no error code.  An access
         # violation raised by ctypes has only text, for example.  In this
@@ -333,7 +339,10 @@ def run_sta(self):
         messageloop.run()
 
     def run_mta(self):
-        import queue
+        if sys.version_info >= (3, 0):
+            import queue
+        else:
+            import Queue as queue
         self._queue = queue.Queue()
         self._queue.get()
 

comtypes/automation.py

@@ -2,6 +2,7 @@
 import array
 import datetime
 import decimal
+import sys
 
 from ctypes import *
 from ctypes import _Pointer
@@ -19,6 +20,15 @@ class _safearray(object):
 from ctypes.wintypes import DWORD, LONG, UINT, VARIANT_BOOL, WCHAR, WORD
 
 
+if sys.version_info >= (3, 0):
+    int_types = (int, )
+    str_types = (str, )
+    base_text_type = str
+else:
+    int_types = (int, long)
+    str_types = (unicode, str)
+    base_text_type = basestring
+
 LCID = DWORD
 DISPID = LONG
 SCODE = LONG
@@ -219,7 +229,7 @@ def _set_value(self, value):
         if value is None:
             self.vt = VT_NULL
         elif (hasattr(value, '__len__') and len(value) == 0
-                and not isinstance(value, str)):
+                and not isinstance(value, base_text_type)):
             self.vt = VT_NULL
         # since bool is a subclass of int, this check must come before
         # the check for int
@@ -229,7 +239,7 @@ def _set_value(self, value):
         elif isinstance(value, (int, c_int)):
             self.vt = VT_I4
             self._.VT_I4 = value
-        elif isinstance(value, int):
+        elif isinstance(value, int_types):
             u = self._
             # try VT_I4 first.
             u.VT_I4 = value
@@ -264,7 +274,7 @@ def _set_value(self, value):
         elif isinstance(value, (float, c_double)):
             self.vt = VT_R8
             self._.VT_R8 = value
-        elif isinstance(value, str):
+        elif isinstance(value, str_types):
             self.vt = VT_BSTR
             # do the c_wchar_p auto unicode conversion
             self._.c_void_p = _SysAllocStringLen(value, len(value))
@@ -539,7 +549,10 @@ def ChangeType(self, typecode):
 VARIANT.empty = VARIANT()
 VARIANT.missing = v = VARIANT()
 v.vt = VT_ERROR
-v._.VT_I4 = 0x80020004
+if sys.version_info >= (3, 0):
+    v._.VT_I4 = 0x80020004
+else:
+    v._.VT_I4 = 0x80020004L
 del v
 
 _carg_obj = type(byref(c_int()))
@@ -583,11 +596,18 @@ class IEnumVARIANT(IUnknown):
     def __iter__(self):
         return self
 
-    def __next__(self):
-        item, fetched = self.Next(1)
-        if fetched:
-            return item
-        raise StopIteration
+    if sys.version_info >= (3, 0):
+        def __next__(self):
+            item, fetched = self.Next(1)
+            if fetched:
+                return item
+            raise StopIteration
+    else:
+        def next(self):
+            item, fetched = self.Next(1)
+            if fetched:
+                return item
+            raise StopIteration
 
     def __getitem__(self, index):
         self.Reset()