Skip to content

Python 3 one core: Don't check for sys.frozen in the check method. - #9857

Merged
feerrenrut merged 2 commits into
nvaccess:threshold_py3_stagingfrom
BabbageCom:frozen
Jul 5, 2019
Merged

Python 3 one core: Don't check for sys.frozen in the check method.#9857
feerrenrut merged 2 commits into
nvaccess:threshold_py3_stagingfrom
BabbageCom:frozen

Conversation

@LeonarddeR

Copy link
Copy Markdown
Collaborator

Link to issue number:

None

Summary of the issue:

When running a python 2 copy from source, NVDA is unable to detect if it is running under Windows 10. Therefore, the oneCore synthesizer contains a work around in its check method, always listing the synthesizer in the synthesizer list when running from source, even on Windows versions older than Windows 10.
On Python 3 however, the manifest of the main Python targets Windows 10 and therefore, this workaround is no longer necessary.

Description of how this pull request fixes the issue:

Changed the check method to always evaluate the current windows version.

Testing performed:

  1. Tested that on Windows 10, the one core synth is listed and works when running from source.
  2. Tested that when compatibility mode was enabled for Windows 8, the one core synthesizer doesn't show up when running from source.

Known issues with pull request:

None

Change log entry:

None. This only affects people running from source.

@LeonarddeR
LeonarddeR requested a review from feerrenrut July 3, 2019 06:32
Comment thread source/synthDrivers/oneCore.py Outdated
return True
# For binary copies, only present this as an available synth if this is Windows 10.
# Only present this as an available synth if this is Windows 10.
return winVersion.winVersion.major >= 10

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

There is also winVersion.isWin10. I think this should be converted to use the helper function. The helper has a note that it doesn't work in source copies, but looking at the implementation it looks equivalent to what you have here.

@feerrenrut
feerrenrut merged commit b229fc4 into nvaccess:threshold_py3_staging Jul 5, 2019
@nvaccessAuto nvaccessAuto added this to the 2019.3 milestone Jul 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants