Skip to content

Commit 06df096

Browse files
committed
Ensure self._name is set
1 parent 6806244 commit 06df096

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

Lib/ctypes/__init__.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -422,13 +422,10 @@ class _FuncPtr(_CFuncPtr):
422422
if name:
423423
name = _os.fspath(name)
424424

425-
if handle is None:
426-
self._handle = self._load_library(name, mode, winmode)
427-
else:
428-
self._handle = handle
425+
self._handle = self._load_library(name, mode, handle, winmode)
429426

430427
if _os.name == "nt":
431-
def _load_library(self, name, mode, winmode):
428+
def _load_library(self, name, mode, handle, winmode):
432429
if winmode is not None:
433430
mode = winmode
434431
else:
@@ -443,10 +440,12 @@ def _load_library(self, name, mode, winmode):
443440
name = _nt._getfullpathname(name)
444441
mode |= _nt._LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR
445442
self._name = name
443+
if handle is not None:
444+
return handle
446445
return _LoadLibrary(self._name, mode)
447446

448447
else:
449-
def _load_library(self, name, mode, winmode):
448+
def _load_library(self, name, mode, handle, winmode):
450449
if _sys.platform.startswith("aix"):
451450
"""When the name contains ".a(" and ends with ")",
452451
e.g., "libFOO.a(libFOO.so)" - this is taken to be an

0 commit comments

Comments
 (0)