diff --git a/coverage/pytracer.py b/coverage/pytracer.py index 7ab4d3ef9..8b81cf0e1 100644 --- a/coverage/pytracer.py +++ b/coverage/pytracer.py @@ -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: @@ -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? @@ -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. diff --git a/tests/test_concurrency.py b/tests/test_concurrency.py index 86c69cf50..54e500148 100644 --- a/tests/test_concurrency.py +++ b/tests/test_concurrency.py @@ -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: