comtypes 1.4.7__zip → 1.4.9__zip

comtypes-1.4.9/comtypes/test/test_server_register.py

@@ -0,0 +1,536 @@
+import _ctypes
+import ctypes
+import os
+import sys
+import unittest as ut
+import winreg
+from unittest import mock
+
+import comtypes
+import comtypes.server.inprocserver
+from comtypes import GUID
+from comtypes.server import register
+from comtypes.server.register import Registrar, RegistryEntries, _get_serverdll
+
+HKCR = winreg.HKEY_CLASSES_ROOT
+MULTI_SZ = winreg.REG_MULTI_SZ
+SZ = winreg.REG_SZ
+
+
+class Test_Registrar_nodebug(ut.TestCase):
+    @mock.patch.object(register, "winreg")
+    def test_calls_openkey_and_deletekey(self, _winreg):
+        _winreg.HKEY_CLASSES_ROOT = HKCR
+        hkey = mock.Mock(spec=winreg.HKEYType)
+        _winreg.OpenKey.return_value = hkey
+        reg_clsid = GUID.create_new()
+        registrar = Registrar()
+
+        class Cls:
+            _reg_clsid_ = reg_clsid
+
+        registrar.nodebug(Cls)
+        _winreg.OpenKey.assert_called_once_with(HKCR, rf"CLSID\{reg_clsid}")
+        _winreg.DeleteKey.assert_called_once_with(hkey, "Logging")
+
+    @mock.patch.object(register, "winreg")
+    def test_ignores_winerror(self, _winreg):
+        _winreg.HKEY_CLASSES_ROOT = HKCR
+        ERROR_FILE_NOT_FOUND = 2
+        err = OSError(ERROR_FILE_NOT_FOUND, "msg", "filename", ERROR_FILE_NOT_FOUND)
+        _winreg.OpenKey.side_effect = err
+        reg_clsid = GUID.create_new()
+        registrar = Registrar()
+
+        class Cls:
+            _reg_clsid_ = reg_clsid
+
+        registrar.nodebug(Cls)
+        _winreg.OpenKey.assert_called_once_with(HKCR, rf"CLSID\{reg_clsid}")
+        _winreg.DeleteKey.assert_not_called()
+
+    @mock.patch.object(register, "winreg")
+    def test_not_ignores_winerror(self, _winreg):
+        _winreg.HKEY_CLASSES_ROOT = HKCR
+        hkey = mock.Mock(spec=winreg.HKEYType)
+        _winreg.OpenKey.return_value = hkey
+        ERROR_ACCESS_DENIED = 5
+        err = OSError(ERROR_ACCESS_DENIED, "msg", "filename", ERROR_ACCESS_DENIED)
+        _winreg.OpenKey.return_value = hkey
+        _winreg.DeleteKey.side_effect = err
+        reg_clsid = GUID.create_new()
+        registrar = Registrar()
+
+        class Cls:
+            _reg_clsid_ = reg_clsid
+
+        with self.assertRaises(OSError) as e:
+            registrar.nodebug(Cls)
+        self.assertEqual(e.exception.winerror, ERROR_ACCESS_DENIED)
+        _winreg.OpenKey.assert_called_once_with(HKCR, rf"CLSID\{reg_clsid}")
+        _winreg.DeleteKey.assert_called_once_with(hkey, "Logging")
+
+
+class Test_Registrar_debug(ut.TestCase):
+    @mock.patch.object(register, "winreg")
+    def test_calls_createkey_and_sets_format(self, _winreg):
+        _winreg.HKEY_CLASSES_ROOT = HKCR
+        _winreg.REG_MULTI_SZ = MULTI_SZ
+        _winreg.REG_SZ = SZ
+        hkey = mock.Mock(spec=winreg.HKEYType)
+        _winreg.CreateKey.return_value = hkey
+        levels = ["lv=DEBUG"]
+        format = "FMT"
+        reg_clsid = GUID.create_new()
+        registrar = Registrar()
+
+        class Cls:
+            _reg_clsid_ = reg_clsid
+
+        registrar.debug(Cls, levels, format)
+        _winreg.CreateKey.assert_called_once_with(HKCR, rf"CLSID\{reg_clsid}\Logging")
+        self.assertEqual(
+            _winreg.SetValueEx.call_args_list,
+            [
+                mock.call(hkey, "levels", None, MULTI_SZ, levels),
+                mock.call(hkey, "format", None, SZ, format),
+            ],
+        )
+
+    @mock.patch.object(register, "winreg")
+    def test_calls_createkey_and_deletes_format(self, _winreg):
+        _winreg.HKEY_CLASSES_ROOT = HKCR
+        _winreg.REG_MULTI_SZ = MULTI_SZ
+        hkey = mock.Mock(spec=winreg.HKEYType)
+        _winreg.CreateKey.return_value = hkey
+        levels = ["lv=DEBUG"]
+        reg_clsid = GUID.create_new()
+        registrar = Registrar()
+
+        class Cls:
+            _reg_clsid_ = reg_clsid
+
+        registrar.debug(Cls, levels, None)
+        _winreg.CreateKey.assert_called_once_with(HKCR, rf"CLSID\{reg_clsid}\Logging")
+        _winreg.SetValueEx.assert_called_once_with(
+            hkey, "levels", None, MULTI_SZ, levels
+        )
+        _winreg.DeleteValue.assert_called_once_with(hkey, "format")
+
+    @mock.patch.object(register, "winreg")
+    def test_calls_createkey_and_ignores_errors_on_deleting(self, _winreg):
+        _winreg.HKEY_CLASSES_ROOT = HKCR
+        _winreg.REG_MULTI_SZ = MULTI_SZ
+        hkey = mock.Mock(spec=winreg.HKEYType)
+        _winreg.CreateKey.return_value = hkey
+        ERROR_FILE_NOT_FOUND = 2
+        err = OSError(ERROR_FILE_NOT_FOUND, "msg", "filename", ERROR_FILE_NOT_FOUND)
+        _winreg.DeleteValue.side_effect = err
+        levels = ["lv=DEBUG"]
+        reg_clsid = GUID.create_new()
+        registrar = Registrar()
+
+        class Cls:
+            _reg_clsid_ = reg_clsid
+
+        registrar.debug(Cls, levels, None)
+        _winreg.CreateKey.assert_called_once_with(HKCR, rf"CLSID\{reg_clsid}\Logging")
+        _winreg.SetValueEx.assert_called_once_with(
+            hkey, "levels", None, MULTI_SZ, levels
+        )
+        _winreg.DeleteValue.assert_called_once_with(hkey, "format")
+
+    @mock.patch.object(register, "winreg")
+    def test_calls_createkey_and_not_ignores_errors_on_deleting(self, _winreg):
+        _winreg.HKEY_CLASSES_ROOT = HKCR
+        _winreg.REG_MULTI_SZ = MULTI_SZ
+        hkey = mock.Mock(spec=winreg.HKEYType)
+        _winreg.CreateKey.return_value = hkey
+        ERROR_ACCESS_DENIED = 5
+        err = OSError(ERROR_ACCESS_DENIED, "msg", "filename", ERROR_ACCESS_DENIED)
+        _winreg.DeleteValue.side_effect = err
+        levels = ["lv=DEBUG"]
+        reg_clsid = GUID.create_new()
+        registrar = Registrar()
+
+        class Cls:
+            _reg_clsid_ = reg_clsid
+
+        with self.assertRaises(OSError) as e:
+            registrar.debug(Cls, levels, None)
+        self.assertEqual(e.exception.winerror, ERROR_ACCESS_DENIED)
+        _winreg.CreateKey.assert_called_once_with(HKCR, rf"CLSID\{reg_clsid}\Logging")
+        _winreg.SetValueEx.assert_called_once_with(
+            hkey, "levels", None, MULTI_SZ, levels
+        )
+        _winreg.DeleteValue.assert_called_once_with(hkey, "format")
+
+
+class Test_Registrar_register(ut.TestCase):
+    def test_calls_cls_register(self):
+        cls = mock.Mock(spec=["_register"])
+        registrar = Registrar()
+        registrar.register(cls)
+        cls._register.assert_called_once_with(registrar)
+
+    # The coverage for COM server registration is ensured by the setup
+    # of `test_comserver` and `test_dispinterface`, so no additional tests
+    # are performed here now.
+
+
+class Test_Registrar_unregister(ut.TestCase):
+    def test_calls_cls_unregister(self):
+        cls = mock.Mock(spec=["_unregister"])
+        registrar = Registrar()
+        registrar.unregister(cls)
+        cls._unregister.assert_called_once_with(registrar)
+
+    # The coverage for COM server unregistration is ensured by the teardown
+    # of `test_comserver` and `test_dispinterface`, so no additional tests
+    # are performed here now.
+
+
+class Test_get_serverdll(ut.TestCase):
+    def test_nonfrozen(self):
+        self.assertEqual(_ctypes.__file__, _get_serverdll())
+
+    def test_frozen(self):
+        with mock.patch.object(register, "sys") as _sys:
+            with mock.patch.object(register, "windll") as _windll:
+                handle = 1234
+                _sys.frozendllhandle = handle
+                self.assertEqual(b"\x00" * 260, _get_serverdll())
+                GetModuleFileName = _windll.kernel32.GetModuleFileNameA
+                (((hModule, lpFilename, nSize), _),) = GetModuleFileName.call_args_list
+                self.assertEqual(handle, hModule)
+                buf_type = type(ctypes.create_string_buffer(260))
+                self.assertIsInstance(lpFilename, buf_type)
+                self.assertEqual(260, nSize)
+
+
+class Test_NonFrozen_RegistryEntries(ut.TestCase):
+    def test_reg_clsid(self):
+        reg_clsid = GUID.create_new()
+
+        class Cls:
+            _reg_clsid_ = reg_clsid
+
+        expected = [(HKCR, rf"CLSID\{reg_clsid}", "", "")]
+        self.assertEqual(expected, list(RegistryEntries(Cls)))
+
+    def test_reg_desc(self):
+        reg_clsid = GUID.create_new()
+        reg_desc = "description for testing"
+
+        class Cls:
+            _reg_clsid_ = reg_clsid
+            _reg_desc_ = reg_desc
+
+        expected = [(HKCR, rf"CLSID\{reg_clsid}", "", reg_desc)]
+        self.assertEqual(expected, list(RegistryEntries(Cls)))
+
+    def test_reg_novers_progid(self):
+        reg_clsid = GUID.create_new()
+        reg_novers_progid = "Lib.Server"
+
+        class Cls:
+            _reg_clsid_ = reg_clsid
+            _reg_novers_progid_ = reg_novers_progid
+
+        expected = [(HKCR, rf"CLSID\{reg_clsid}", "", "Lib Server")]
+        self.assertEqual(expected, list(RegistryEntries(Cls)))
+
+    def test_progid(self):
+        reg_clsid = GUID.create_new()
+        reg_progid = "Lib.Server.1"
+
+        class Cls:
+            _reg_clsid_ = reg_clsid
+            _reg_progid_ = reg_progid
+
+        expected = [
+            (HKCR, rf"CLSID\{reg_clsid}", "", "Lib Server 1"),
+            (HKCR, rf"CLSID\{reg_clsid}\ProgID", "", reg_progid),
+            (HKCR, reg_progid, "", "Lib Server 1"),
+            (HKCR, rf"{reg_progid}\CLSID", "", str(reg_clsid)),
+        ]
+        self.assertEqual(expected, list(RegistryEntries(Cls)))
+
+    def test_reg_progid_reg_desc(self):
+        reg_clsid = GUID.create_new()
+        reg_progid = "Lib.Server.1"
+        reg_desc = "description for testing"
+
+        class Cls:
+            _reg_clsid_ = reg_clsid
+            _reg_progid_ = reg_progid
+            _reg_desc_ = reg_desc
+
+        expected = [
+            (HKCR, rf"CLSID\{reg_clsid}", "", reg_desc),
+            (HKCR, rf"CLSID\{reg_clsid}\ProgID", "", reg_progid),
+            (HKCR, reg_progid, "", "description for testing"),
+            (HKCR, rf"{reg_progid}\CLSID", "", str(reg_clsid)),
+        ]
+        self.assertEqual(expected, list(RegistryEntries(Cls)))
+
+    def test_reg_progid_reg_novers_progid(self):
+        reg_clsid = GUID.create_new()
+        reg_progid = "Lib.Server.1"
+        reg_novers_progid = "Lib.Server"
+
+        class Cls:
+            _reg_clsid_ = reg_clsid
+            _reg_progid_ = reg_progid
+            _reg_novers_progid_ = reg_novers_progid
+
+        clsid_sub = rf"CLSID\{reg_clsid}"
+        expected = [
+            (HKCR, clsid_sub, "", "Lib Server"),
+            (HKCR, rf"{clsid_sub}\ProgID", "", reg_progid),
+            (HKCR, reg_progid, "", "Lib Server"),
+            (HKCR, rf"{reg_progid}\CLSID", "", str(reg_clsid)),
+            (HKCR, rf"{clsid_sub}\VersionIndependentProgID", "", reg_novers_progid),
+            (HKCR, reg_novers_progid, "", "Lib Server"),
+            (HKCR, rf"{reg_novers_progid}\CurVer", "", "Lib.Server.1"),
+            (HKCR, rf"{reg_novers_progid}\CLSID", "", str(reg_clsid)),
+        ]
+        self.assertEqual(expected, list(RegistryEntries(Cls)))
+
+    def test_local_server(self):
+        reg_clsid = GUID.create_new()
+        reg_clsctx = comtypes.CLSCTX_LOCAL_SERVER
+
+        class Cls:
+            _reg_clsid_ = reg_clsid
+            _reg_clsctx_ = reg_clsctx
+
+        clsid_sub = rf"CLSID\{reg_clsid}"
+        local_srv_sub = rf"{clsid_sub}\LocalServer32"
+        expected = [
+            (HKCR, clsid_sub, "", ""),
+            (HKCR, local_srv_sub, "", f"{sys.executable} {__file__}"),
+        ]
+        self.assertEqual(expected, list(RegistryEntries(Cls)))
+
+    def test_inproc_server(self):
+        reg_clsid = GUID.create_new()
+        reg_clsctx = comtypes.CLSCTX_INPROC_SERVER
+
+        class Cls:
+            _reg_clsid_ = reg_clsid
+            _reg_clsctx_ = reg_clsctx
+
+        clsid_sub = rf"CLSID\{reg_clsid}"
+        inproc_srv_sub = rf"{clsid_sub}\InprocServer32"
+        full_classname = f"{__name__}.Cls"
+        expected = [
+            (HKCR, clsid_sub, "", ""),
+            (HKCR, inproc_srv_sub, "", _ctypes.__file__),
+            (HKCR, inproc_srv_sub, "PythonClass", full_classname),
+            (HKCR, inproc_srv_sub, "PythonPath", os.path.dirname(__file__)),
+        ]
+        self.assertEqual(expected, list(RegistryEntries(Cls)))
+
+    def test_inproc_server_reg_threading(self):
+        reg_clsid = GUID.create_new()
+        reg_threading = "Both"
+        reg_clsctx = comtypes.CLSCTX_INPROC_SERVER
+
+        class Cls:
+            _reg_clsid_ = reg_clsid
+            _reg_threading_ = reg_threading
+            _reg_clsctx_ = reg_clsctx
+
+        clsid_sub = rf"CLSID\{reg_clsid}"
+        inproc_srv_sub = rf"{clsid_sub}\InprocServer32"
+        full_classname = f"{__name__}.Cls"
+        expected = [
+            (HKCR, clsid_sub, "", ""),
+            (HKCR, inproc_srv_sub, "", _ctypes.__file__),
+            (HKCR, inproc_srv_sub, "PythonClass", full_classname),
+            (HKCR, inproc_srv_sub, "PythonPath", os.path.dirname(__file__)),
+            (HKCR, inproc_srv_sub, "ThreadingModel", reg_threading),
+        ]
+        self.assertEqual(expected, list(RegistryEntries(Cls)))
+
+    def test_reg_typelib(self):
+        reg_clsid = GUID.create_new()
+        libid = str(GUID.create_new())
+        reg_typelib = (libid, 1, 0)
+
+        class Cls:
+            _reg_clsid_ = reg_clsid
+            _reg_typelib_ = reg_typelib
+
+        expected = [
+            (HKCR, rf"CLSID\{reg_clsid}", "", ""),
+            (HKCR, rf"CLSID\{reg_clsid}\Typelib", "", libid),
+        ]
+        self.assertEqual(expected, list(RegistryEntries(Cls)))
+
+    def test_all_entries(self):
+        reg_clsid = GUID.create_new()
+        libid = str(GUID.create_new())
+        reg_typelib = (libid, 1, 0)
+        reg_threading = "Both"
+        reg_progid = "Lib.Server.1"
+        reg_novers_progid = "Lib.Server"
+        reg_desc = "description for testing"
+        reg_clsctx = comtypes.CLSCTX_INPROC_SERVER | comtypes.CLSCTX_LOCAL_SERVER
+
+        class Cls:
+            _reg_clsid_ = reg_clsid
+            _reg_typelib_ = reg_typelib
+            _reg_threading_ = reg_threading
+            _reg_progid_ = reg_progid
+            _reg_novers_progid_ = reg_novers_progid
+            _reg_desc_ = reg_desc
+            _reg_clsctx_ = reg_clsctx
+
+        clsid_sub = rf"CLSID\{reg_clsid}"
+        inproc_srv_sub = rf"{clsid_sub}\InprocServer32"
+        local_srv_sub = rf"{clsid_sub}\LocalServer32"
+        full_classname = f"{__name__}.Cls"
+        expected = [
+            (HKCR, clsid_sub, "", reg_desc),
+            (HKCR, rf"{clsid_sub}\ProgID", "", reg_progid),
+            (HKCR, reg_progid, "", reg_desc),
+            (HKCR, rf"{reg_progid}\CLSID", "", str(reg_clsid)),
+            (HKCR, rf"{clsid_sub}\VersionIndependentProgID", "", reg_novers_progid),
+            (HKCR, reg_novers_progid, "", reg_desc),
+            (HKCR, rf"{reg_novers_progid}\CurVer", "", reg_progid),
+            (HKCR, rf"{reg_novers_progid}\CLSID", "", str(reg_clsid)),
+            (HKCR, local_srv_sub, "", f"{sys.executable} {__file__}"),
+            (HKCR, inproc_srv_sub, "", _ctypes.__file__),
+            (HKCR, inproc_srv_sub, "PythonClass", full_classname),
+            (HKCR, inproc_srv_sub, "PythonPath", os.path.dirname(__file__)),
+            (HKCR, inproc_srv_sub, "ThreadingModel", reg_threading),
+            (HKCR, rf"{clsid_sub}\Typelib", "", libid),
+        ]
+        self.assertEqual(expected, list(RegistryEntries(Cls)))
+
+
+class Test_Frozen_RegistryEntries(ut.TestCase):
+    @mock.patch.object(register, "sys")
+    def test_local_dll(self, _sys):
+        _sys.mock_add_spec(["executable", "frozen"])
+        _sys.executable = sys.executable
+        _sys.frozen = "dll"
+        reg_clsid = GUID.create_new()
+        reg_clsctx = comtypes.CLSCTX_LOCAL_SERVER
+
+        class Cls:
+            _reg_clsid_ = reg_clsid
+            _reg_clsctx_ = reg_clsctx
+
+        clsid_sub = rf"CLSID\{reg_clsid}"
+        expected = [
+            (HKCR, clsid_sub, "", ""),
+            (HKCR, rf"{clsid_sub}\LocalServer32", "", sys.executable),
+        ]
+        self.assertEqual(expected, list(RegistryEntries(Cls)))
+
+    @mock.patch.object(register, "sys")
+    def test_local_frozendllhandle(self, _sys):
+        _sys.mock_add_spec(["frozen", "frozendllhandle"])
+        _sys.frozen = "dll"
+        _sys.frozendllhandle = 1234
+        reg_clsid = GUID.create_new()
+        reg_clsctx = comtypes.CLSCTX_LOCAL_SERVER
+
+        class Cls:
+            _reg_clsid_ = reg_clsid
+            _reg_clsctx_ = reg_clsctx
+
+        expected = [(HKCR, rf"CLSID\{reg_clsid}", "", "")]
+        self.assertEqual(expected, list(RegistryEntries(Cls)))
+
+    @mock.patch.object(register, "sys")
+    def test_inproc_windows_exe(self, _sys):
+        _sys.mock_add_spec(["frozen"])
+        _sys.frozen = "windows_exe"
+        reg_clsid = GUID.create_new()
+        reg_clsctx = comtypes.CLSCTX_INPROC_SERVER
+
+        class Cls:
+            _reg_clsid_ = reg_clsid
+            _reg_clsctx_ = reg_clsctx
+
+        expected = [(HKCR, rf"CLSID\{reg_clsid}", "", "")]
+        self.assertEqual(expected, list(RegistryEntries(Cls)))
+
+    @mock.patch.object(register, "_get_serverdll", lambda: r"my\target\server.dll")
+    @mock.patch.object(register, "sys")
+    def test_inproc_dll_frozendllhandle_clsid_to_class(self, _sys):
+        _sys.mock_add_spec(["frozen", "frozendllhandle"])
+        _sys.frozen = "dll"
+        _sys.frozendllhandle = 1234
+        reg_clsid = GUID.create_new()
+        reg_clsctx = comtypes.CLSCTX_INPROC_SERVER
+
+        class Cls:
+            _reg_clsid_ = reg_clsid
+            _reg_clsctx_ = reg_clsctx
+
+        clsid_sub = rf"CLSID\{reg_clsid}"
+        inproc_srv_sub = rf"{clsid_sub}\InprocServer32"
+        expected = [
+            (HKCR, clsid_sub, "", ""),
+            (HKCR, inproc_srv_sub, "", r"my\target\server.dll"),
+        ]
+
+        with mock.patch.dict(comtypes.server.inprocserver._clsid_to_class):
+            comtypes.server.inprocserver._clsid_to_class.update({5678: Cls})
+            self.assertEqual(expected, list(RegistryEntries(Cls)))
+
+    @mock.patch.object(register, "_get_serverdll", lambda: r"my\target\server.dll")
+    @mock.patch.object(register, "sys")
+    def test_inproc_dll(self, _sys):
+        _sys.mock_add_spec(["frozen", "modules"])
+        _sys.frozen = "dll"
+        _sys.modules = sys.modules
+        reg_clsid = GUID.create_new()
+        reg_clsctx = comtypes.CLSCTX_INPROC_SERVER
+
+        class Cls:
+            _reg_clsid_ = reg_clsid
+            _reg_clsctx_ = reg_clsctx
+
+        clsid_sub = rf"CLSID\{reg_clsid}"
+        inproc_srv_sub = rf"{clsid_sub}\InprocServer32"
+        full_classname = f"{__name__}.Cls"
+        expected = [
+            (HKCR, clsid_sub, "", ""),
+            (HKCR, inproc_srv_sub, "", r"my\target\server.dll"),
+            (HKCR, inproc_srv_sub, "PythonClass", full_classname),
+            (HKCR, inproc_srv_sub, "PythonPath", os.path.dirname(__file__)),
+        ]
+        self.assertEqual(expected, list(RegistryEntries(Cls)))
+
+    @mock.patch.object(register, "_get_serverdll", lambda: r"my\target\server.dll")
+    @mock.patch.object(register, "sys")
+    def test_inproc_dll_reg_threading(self, _sys):
+        _sys.mock_add_spec(["frozen", "modules"])
+        _sys.frozen = "dll"
+        _sys.modules = sys.modules
+        reg_clsid = GUID.create_new()
+        reg_threading = "Both"
+        reg_clsctx = comtypes.CLSCTX_INPROC_SERVER
+
+        class Cls:
+            _reg_clsid_ = reg_clsid
+            _reg_threading_ = reg_threading
+            _reg_clsctx_ = reg_clsctx
+
+        clsid_sub = rf"CLSID\{reg_clsid}"
+        inproc_srv_sub = rf"{clsid_sub}\InprocServer32"
+        full_classname = f"{__name__}.Cls"
+        expected = [
+            (HKCR, clsid_sub, "", ""),
+            (HKCR, inproc_srv_sub, "", r"my\target\server.dll"),
+            (HKCR, inproc_srv_sub, "PythonClass", full_classname),
+            (HKCR, inproc_srv_sub, "PythonPath", os.path.dirname(__file__)),
+            (HKCR, inproc_srv_sub, "ThreadingModel", reg_threading),
+        ]
+        self.assertEqual(expected, list(RegistryEntries(Cls)))

{comtypes-1.4.7 → comtypes-1.4.9}/comtypes/test/test_shelllink.py

@@ -50,17 +50,15 @@ class Test_IShellLinkA(ut.TestCase):
         self.assertEqual(shortcut.GetArguments(), b"-f")
 
     def test_set_and_get_hotkey(self):
-        HOTKEYF_ALT = 0x04
-        HOTKEYF_CONTROL = 0x02
+        hotkey = shelllink.HOTKEYF_ALT | shelllink.HOTKEYF_CONTROL
         shortcut = self._create_shortcut()
-        shortcut.Hotkey = HOTKEYF_ALT | HOTKEYF_CONTROL
-        self.assertEqual(shortcut.Hotkey, HOTKEYF_ALT | HOTKEYF_CONTROL)
+        shortcut.Hotkey = hotkey
+        self.assertEqual(shortcut.Hotkey, hotkey)
 
     def test_set_and_get_showcmd(self):
-        SW_SHOWMAXIMIZED = 0x03
         shortcut = self._create_shortcut()
-        shortcut.ShowCmd = SW_SHOWMAXIMIZED
-        self.assertEqual(shortcut.ShowCmd, SW_SHOWMAXIMIZED)
+        shortcut.ShowCmd = shelllink.SW_SHOWMAXIMIZED
+        self.assertEqual(shortcut.ShowCmd, shelllink.SW_SHOWMAXIMIZED)
 
     def test_set_and_get_icon_location(self):
         shortcut = self._create_shortcut()
@@ -113,17 +111,15 @@ class Test_IShellLinkW(ut.TestCase):
         self.assertEqual(shortcut.GetArguments(), "-f")
 
     def test_set_and_get_hotkey(self):
-        HOTKEYF_ALT = 0x04
-        HOTKEYF_CONTROL = 0x02
+        hotkey = shelllink.HOTKEYF_ALT | shelllink.HOTKEYF_CONTROL
         shortcut = self._create_shortcut()
-        shortcut.Hotkey = HOTKEYF_ALT | HOTKEYF_CONTROL
-        self.assertEqual(shortcut.Hotkey, HOTKEYF_ALT | HOTKEYF_CONTROL)
+        shortcut.Hotkey = hotkey
+        self.assertEqual(shortcut.Hotkey, hotkey)
 
     def test_set_and_get_showcmd(self):
-        SW_SHOWMAXIMIZED = 0x03
         shortcut = self._create_shortcut()
-        shortcut.ShowCmd = SW_SHOWMAXIMIZED
-        self.assertEqual(shortcut.ShowCmd, SW_SHOWMAXIMIZED)
+        shortcut.ShowCmd = shelllink.SW_SHOWMAXIMIZED
+        self.assertEqual(shortcut.ShowCmd, shelllink.SW_SHOWMAXIMIZED)
 
     def test_set_and_get_icon_location(self):
         shortcut = self._create_shortcut()

{comtypes-1.4.7 → comtypes-1.4.9}/comtypes/test/test_showevents.py

@@ -1,24 +1,14 @@
 import doctest
-import sys
-import re
 import unittest
+from typing import Optional
 
 
-class SixDocChecker(doctest.OutputChecker):
-    # see https://dirkjan.ochtman.nl/writing/2014/07/06/single-source-python-23-doctests.html
-    def check_output(self, want, got, optionflags):
-        if sys.version_info >= (3, 0):
-            want = re.sub(r"u'(.*?)'", r"'\1'", want)
-            want = re.sub(r'u"(.*?)"', r'"\1"', want)
-        return doctest.OutputChecker.check_output(self, want, got, optionflags)
-
-
-def load_tests(loader, tests, ignore):
+def load_tests(
+    loader: unittest.TestLoader, tests: unittest.TestSuite, pattern: Optional[str]
+) -> unittest.TestSuite:
     import comtypes.test.test_showevents
 
-    tests.addTests(
-        doctest.DocTestSuite(comtypes.test.test_showevents, checker=SixDocChecker())
-    )
+    tests.addTests(doctest.DocTestSuite(comtypes.test.test_showevents))
     return tests
 
 
@@ -32,9 +22,9 @@ class ShowEventsExamples:
         >>> conn = ShowEvents(font)
         # event found: FontEvents_FontChanged
         >>> font.Name = 'Arial'
-        Event FontEvents_FontChanged(None, u'Name')
+        Event FontEvents_FontChanged(None, 'Name')
         >>> font.Italic = True
-        Event FontEvents_FontChanged(None, u'Italic')
+        Event FontEvents_FontChanged(None, 'Italic')
         >>> PumpEvents(0.01)  # just calling. assertion does in `test_pump_events.py`
         >>> conn.disconnect()
         """