Skip to content

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

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
feerrenrut merged 2 commits into from
Jul 5, 2019
Merged

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

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
3a165d8
Python 3 one core: Don't check for sys.frozen in the check method.
Jul 3, 2019
48c78b0
Review actions
Jul 3, 2019
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
9 changes: 2 additions & 7 deletions source/synthDrivers/oneCore.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,8 @@ class SynthDriver(SynthDriver):

@classmethod
def check(cls):
if not hasattr(sys, "frozen"):
# #3793: Source copies don't report the correct version on Windows 10 because Python isn't manifested for higher versions.
# We want this driver to work for source copies on Windows 10, so just return True here.
# If this isn't in fact Windows 10, it will fail when constructed, which is okay.
return True
# For binary copies, only present this as an available synth if this is Windows 10.
return winVersion.winVersion.major >= 10
# Only present this as an available synth if this is Windows 10.
return winVersion.isWin10()

def _get_supportsProsodyOptions(self):
self.supportsProsodyOptions = self._dll.ocSpeech_supportsProsodyOptions()
Expand Down
1 change: 0 additions & 1 deletion source/winVersion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ def isUwpOcrAvailable():
def isWin10(version=1507, atLeast=True):
"""
Returns True if NVDA is running on the supplied release version of Windows 10. If no argument is supplied, returns True for all public Windows 10 releases.
@note: this function will always return False for source copies of NVDA due to a Python bug.
@param version: a release version of Windows 10 (such as 1903).
@param atLeast: return True if NVDA is running on at least this Windows 10 build (i.e. this version or higher).
"""
Expand Down