Skip to content

Explicitly add DLL directories for Windows before importing #113

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
jacobperron merged 2 commits into from
May 18, 2020
Merged

Explicitly add DLL directories for Windows before importing #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b00db7f
Explicitly add DLL directories for Windows before importing
jacobperron May 14, 2020
6adb295
Move logic to common package rpyutils
jacobperron May 16, 2020
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
1 change: 1 addition & 0 deletions rosidl_generator_py/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<exec_depend>rosidl_generator_c</exec_depend>
<exec_depend>rosidl_parser</exec_depend>
<exec_depend>rosidl_runtime_c</exec_depend>
<exec_depend>rpyutils</exec_depend>

<test_depend>ament_cmake_pytest</test_depend>
<test_depend>ament_index_python</test_depend>
Expand Down
8 changes: 7 additions & 1 deletion rosidl_generator_py/rosidl_generator_py/import_type_support_impl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

import importlib

from rpyutils import add_dll_directories_from_env


class UnsupportedTypeSupport(Exception):
"""Raised when typesupport couldn't be imported."""
Expand All @@ -37,6 +39,10 @@ def import_type_support(pkg_name):
"""
module_name = '.{}_s__rosidl_typesupport_c'.format(pkg_name)
try:
return importlib.import_module(module_name, package=pkg_name)
# Since Python 3.8, on Windows we should ensure DLL directories are explicitly added
# to the search path.
# See https://docs.python.org/3/whatsnew/3.8.html#bpo-36085-whatsnew
with add_dll_directories_from_env('PATH'):
return importlib.import_module(module_name, package=pkg_name)
except ImportError:
raise UnsupportedTypeSupport(pkg_name)