Skip to content

Commit

Permalink
Use current_thread instead of currentThread that was deprecated in Py…
Browse files Browse the repository at this point in the history
…thon 3.10
  • Loading branch information
tirkarthi authored and nedbat committed Apr 17, 2021
1 parent 05fbe9c commit 90815d9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions coverage/pytracer.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def log(self, marker, *args):
if 0:
f.write(".{:x}.{:x}".format(
self.thread.ident,
self.threading.currentThread().ident,
self.threading.current_thread().ident,
))
f.write(" {}".format(" ".join(map(str, args))))
if 0:
Expand Down Expand Up @@ -220,9 +220,9 @@ def start(self):
self.stopped = False
if self.threading:
if self.thread is None:
self.thread = self.threading.currentThread()
self.thread = self.threading.current_thread()
else:
if self.thread.ident != self.threading.currentThread().ident:
if self.thread.ident != self.threading.current_thread().ident:
# Re-starting from a different thread!? Don't set the trace
# function, but we are marked as running again, so maybe it
# will be ok?
Expand All @@ -243,7 +243,7 @@ def stop(self):
# right thread.
self.stopped = True

if self.threading and self.thread.ident != self.threading.currentThread().ident:
if self.threading and self.thread.ident != self.threading.current_thread().ident:
# Called on a different thread than started us: we can't unhook
# ourselves, but we've set the flag that we should stop, so we
# won't do any more tracing.
Expand Down
2 changes: 1 addition & 1 deletion tests/test_concurrency.py
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ def test_coverage_stop_in_threads():
def run_thread(): # pragma: nested
"""Check that coverage is stopping properly in threads."""
deadline = time.time() + 5
ident = threading.currentThread().ident
ident = threading.current_thread().ident
if sys.gettrace() is not None:
has_started_coverage.append(ident)
while sys.gettrace() is not None:
Expand Down

0 comments on commit 90815d9

Please sign in to comment.