From cb491e7f906cd0dca3718cc05bc00b738b638f7d Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Sat, 31 Dec 2016 09:48:34 -0500 Subject: The PyPy-specific test for atexit/gettrace are also PyPy-version-specific... --- coverage/env.py | 2 ++ coverage/pytracer.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'coverage') diff --git a/coverage/env.py b/coverage/env.py index 4cd02c04..6db3b857 100644 --- a/coverage/env.py +++ b/coverage/env.py @@ -12,6 +12,8 @@ LINUX = sys.platform == "linux2" # Python implementations. PYPY = '__pypy__' in sys.builtin_module_names +if PYPY: + PYPYVERSION = sys.pypy_version_info # Python versions. PYVERSION = sys.version_info diff --git a/coverage/pytracer.py b/coverage/pytracer.py index 13a3b0c8..6cd3ea30 100644 --- a/coverage/pytracer.py +++ b/coverage/pytracer.py @@ -153,7 +153,7 @@ class PyTracer(object): # so don't warn if we are in atexit on PyPy and the trace function # has changed to None. tf = sys.gettrace() - dont_warn = (env.PYPY and self.in_atexit and tf is None) + dont_warn = (env.PYPY and env.PYPYVERSION >= (5, 4) and self.in_atexit and tf is None) if (not dont_warn) and tf != self._trace: self.warn("Trace function changed, measurement is likely wrong: %r" % (tf,)) -- cgit v1.2.1