Skip to content

Remove Outdated Python 2.3 Compatibility and Unused Test Utilities. #916

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
junkmd merged 3 commits into from
Jan 25, 2026
Merged

Remove Outdated Python 2.3 Compatibility and Unused Test Utilities. #916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
108d396
test: Simplify `test_subinterface.py`
junkmd Jan 25, 2026
7ecda5d
refactor: Remove unused test utilities from `test/__init__.py`
junkmd Jan 25, 2026
561c07e
refactor: Remove Python 2.3 compatibility for `__name__` assignment.
junkmd Jan 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions comtypes/client/lazybind.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,7 @@ def __getattr__(self, name):
def caller(*args):
return self._comobj._invoke(descr.memid, descr.invkind, 0, *args)

try:
caller.__name__ = name
except TypeError:
# In Python 2.3, __name__ is readonly
pass
caller.__name__ = name
return caller

def __setattr__(self, name, value):
Expand Down
28 changes: 0 additions & 28 deletions comtypes/test/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,37 +37,9 @@ class ResourceDenied(Exception):
"""


def is_resource_enabled(resource):
"""Test whether a resource is enabled.

If the caller's module is __main__ then automatically return True."""
if sys._getframe().f_back.f_globals.get("__name__") == "__main__":
return True
result = use_resources is not None and (
resource in use_resources or "*" in use_resources
)
if not result:
_unavail[resource] = None
return result


_unavail = {}


def requires(resource, msg=None):
"""Raise ResourceDenied if the specified resource is not available.

If the caller's module is __main__ then automatically return True."""
# see if the caller's module is __main__ - if so, treat as if
# the resource was set
if sys._getframe().f_back.f_globals.get("__name__") == "__main__":
return
if not is_resource_enabled(resource):
if msg is None:
msg = f"Use of the `{resource}` resource not enabled"
raise ResourceDenied(msg)


def find_package_modules(package, mask):
import fnmatch

Expand Down
11 changes: 2 additions & 9 deletions comtypes/test/test_subinterface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
import sys
import unittest
from ctypes import *
from ctypes import c_void_p

from comtypes import GUID, IUnknown


def test_main():
from test import test_support

test_support.run_unittest(Test)
from comtypes import IUnknown


class Test(unittest.TestCase):
Expand Down