--- a/eric7/DebugClients/Python/coverage/env.py Fri Aug 20 19:56:17 2021 +0200
+++ b/eric7/DebugClients/Python/coverage/env.py Sat Aug 21 14:21:44 2021 +0200
@@ -11,35 +11,49 @@
WINDOWS = sys.platform == "win32"
LINUX = sys.platform.startswith("linux")
+# Python implementations.
+CPYTHON = (platform.python_implementation() == "CPython")
+PYPY = (platform.python_implementation() == "PyPy")
+JYTHON = (platform.python_implementation() == "Jython")
+IRONPYTHON = (platform.python_implementation() == "IronPython")
+
# Python versions. We amend version_info with one more value, a zero if an
# official version, or 1 if built from source beyond an official version.
PYVERSION = sys.version_info + (int(platform.python_version()[-1] == "+"),)
PY2 = PYVERSION < (3, 0)
PY3 = PYVERSION >= (3, 0)
-# Python implementations.
-PYPY = (platform.python_implementation() == 'PyPy')
if PYPY:
PYPYVERSION = sys.pypy_version_info
PYPY2 = PYPY and PY2
PYPY3 = PYPY and PY3
-JYTHON = (platform.python_implementation() == 'Jython')
-IRONPYTHON = (platform.python_implementation() == 'IronPython')
-
-# Python behavior
+# Python behavior.
class PYBEHAVIOR(object):
"""Flags indicating this Python's behavior."""
+ pep626 = CPYTHON and (PYVERSION > (3, 10, 0, 'alpha', 4))
+
# Is "if __debug__" optimized away?
- optimize_if_debug = (not PYPY)
+ if PYPY3:
+ optimize_if_debug = True
+ elif PYPY2:
+ optimize_if_debug = False
+ else:
+ optimize_if_debug = not pep626
# Is "if not __debug__" optimized away?
optimize_if_not_debug = (not PYPY) and (PYVERSION >= (3, 7, 0, 'alpha', 4))
+ if pep626:
+ optimize_if_not_debug = False
+ if PYPY3:
+ optimize_if_not_debug = True
# Is "if not __debug__" optimized away even better?
optimize_if_not_debug2 = (not PYPY) and (PYVERSION >= (3, 8, 0, 'beta', 1))
+ if pep626:
+ optimize_if_not_debug2 = False
# Do we have yield-from?
yield_from = (PYVERSION >= (3, 3))
@@ -66,13 +80,16 @@
# used to be an empty string (meaning the current directory). It changed
# to be the actual path to the current directory, so that os.chdir wouldn't
# affect the outcome.
- actual_syspath0_dash_m = (not PYPY) and (PYVERSION >= (3, 7, 0, 'beta', 3))
+ actual_syspath0_dash_m = CPYTHON and (PYVERSION >= (3, 7, 0, 'beta', 3))
+
+ # 3.7 changed how functions with only docstrings are numbered.
+ docstring_only_function = (not PYPY) and ((3, 7, 0, 'beta', 5) <= PYVERSION <= (3, 10))
# When a break/continue/return statement in a try block jumps to a finally
# block, does the finally block do the break/continue/return (pre-3.8), or
# does the finally jump back to the break/continue/return (3.8) to do the
# work?
- finally_jumps_back = (PYVERSION >= (3, 8))
+ finally_jumps_back = ((3, 8) <= PYVERSION < (3, 10))
# When a function is decorated, does the trace function get called for the
# @-line and also the def-line (new behavior in 3.8)? Or just the @-line
@@ -85,6 +102,20 @@
# Python 3.9a1 made sys.argv[0] and other reported files absolute paths.
report_absolute_files = (PYVERSION >= (3, 9))
+ # Lines after break/continue/return/raise are no longer compiled into the
+ # bytecode. They used to be marked as missing, now they aren't executable.
+ omit_after_jump = pep626
+
+ # PyPy has always omitted statements after return.
+ omit_after_return = omit_after_jump or PYPY
+
+ # Modules used to have firstlineno equal to the line number of the first
+ # real line of code. Now they always start at 1.
+ module_firstline_1 = pep626
+
+ # Are "if 0:" lines (and similar) kept in the compiled code?
+ keep_constant_test = pep626
+
# Coverage.py specifics.
# Are we using the C-implemented trace function?
