Skip to content

Python 3: use threading instead of thread. #9713

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
michaelDCurran merged 1 commit into from
Jun 11, 2019
Merged

Python 3: use threading instead of thread. #9713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 1 deletion source/bdDetect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
from logHandler import log
import config
import time
import thread
import appModuleHandler
from baseObject import AutoPropertyObject
import re
Expand Down
8 changes: 4 additions & 4 deletions source/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import sys
import winVersion
import thread
import threading
import nvwave
import os
import time
Expand All @@ -37,7 +37,7 @@
PUMP_MAX_DELAY = 10

#: The thread identifier of the main thread.
mainThreadId = thread.get_ident()
mainThreadId = threading.get_ident()

#: Notifies when a window message has been received by NVDA.
#: This allows components to perform an action when several system events occur,
Expand Down Expand Up @@ -585,7 +585,7 @@ def requestPump():
if not _pump or _isPumpPending:
return
_isPumpPending = True
if thread.get_ident() == mainThreadId:
if threading.get_ident() == mainThreadId:
_pump.Start(PUMP_MAX_DELAY, True)
return
# This isn't the main thread. wx timers cannot be run outside the main thread.
Expand All @@ -600,7 +600,7 @@ def callLater(delay, callable, *args, **kwargs):
This function can be safely called from any thread.
"""
import wx
if thread.get_ident() == mainThreadId:
if threading.get_ident() == mainThreadId:
return wx.CallLater(delay, _callLaterExec, callable, args, kwargs)
else:
return wx.CallAfter(wx.CallLater,delay, _callLaterExec, callable, args, kwargs)
Expand Down