Skip to content

Explicitly add DLL directories for Windows before importing #411

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

Explicitly add DLL directories for Windows before importing #411

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b66774d
Explicitly add DLL directories for Windows before importing
jacobperron May 15, 2020
8718727
Move logic to common package rpyutils
jacobperron May 16, 2020
3447ca4
revert accidental changes
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 rosbag2_transport/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<depend>rosbag2_compression</depend>
<depend>rosbag2_cpp</depend>
<depend>rmw</depend>
<depend>rpyutils</depend>
<depend>shared_queues_vendor</depend>
<depend>yaml_cpp_vendor</depend>

Expand Down
10 changes: 7 additions & 3 deletions rosbag2_transport/rosbag2_transport/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,17 @@
# limitations under the License.

import importlib
import os

from rpyutils import add_dll_directories_from_env


def _import(name):
try:
return importlib.import_module(name, package='rosbag2_transport')
# 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(name, package='rosbag2_transport')
except ImportError as e:
if e.path is not None and os.path.isfile(e.path):
e.msg += \
Expand All @@ -28,5 +33,4 @@ def _import(name):
'#import-failing-even-with-library-present-on-the-system')
raise


Comment thread
jacobperron marked this conversation as resolved.
rosbag2_transport_py = _import('._rosbag2_transport_py')