Skip to content
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

Jump to bottom

Python 3.8/liblouis helper: add NVDA executable path by calling os.add_dll_directory #12020

Merged
merged 4 commits into from
Feb 16, 2021
Merged

Python 3.8/liblouis helper: add NVDA executable path by calling os.add_dll_directory #12020

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af482e1
Louis helper: update copyright header
josephsl Jan 31, 2021
714db9c
Louis helper/Python 3.8: call os.add_dll_directory when importing lib…
josephsl Jan 31, 2021
129c847
Louis helper: remove header comment, use globalVars.appDir as executa…
josephsl Feb 6, 2021
e9fbce0
Louis helper: use globalVars.appDir directly rather than going throug…
josephsl Feb 13, 2021
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
16 changes: 10 additions & 6 deletions source/louisHelper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
#louisHelper.py
#A part of NonVisual Desktop Access (NVDA)
#This file is covered by the GNU General Public License.
#See the file COPYING for more details.
#Copyright (C) 2018 NV Access Limited, Babbage B.V.
# louisHelper.py
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove this line

# A part of NonVisual Desktop Access (NVDA)
# This file is covered by the GNU General Public License.
# See the file COPYING for more details.
# Copyright (C) 2018-2021 NV Access Limited, Babbage B.V., Joseph Lee

"""Helper module to ease communication to and from liblouis."""

import louis
# Python 3.8 changes the way DLL's are loaded due to security.
# Thus manually add NVDA executable path to DLL lookup path for loading liblouis.dll.
import os
with os.add_dll_directory(os.path.dirname(__file__)):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

os.path.dirname(__file__) is not gonna work for binary copies since it would point to nvda_install_dir\library.zip. Please use globalVars.appDir instead.

import louis
from logHandler import log
import config

Expand Down