Fix code to run on Python 3.11.0b3. (#229)

* Fix coveralls.

Author: Michael Howitz

.github/workflows/tests.yml

@@ -27,7 +27,7 @@ jobs:
         - ["3.8",   "py38"]
         - ["3.9",   "py39"]
         - ["3.10",  "py310"]
-        - ["3.11.0-beta.1",  "py311"]
+        - ["3.11.0-beta.3",  "py311"]
         - ["3.9",   "docs"]
         - ["3.9",   "coverage"]
         - ["3.9",   "py39-datetime"]

.meta.toml

@@ -2,7 +2,7 @@
 # https://github.com/zopefoundation/meta/tree/master/config/pure-python
 [meta]
 template = "pure-python"
-commit-id = "5461bae88c19d8d771ba2bd5f00c69540580335d"
+commit-id = "b4cfc9ca6065ca82646fa69d04ee4c15c58035e1"
 
 [python]
 with-pypy = false
@@ -44,6 +44,7 @@ testenv-additional = [
     "    COVERAGE_FILE=.coverage",
     "commands =",
     "    mkdir -p {toxinidir}/parts/htmlcov",
+    "    coverage erase",
     "    coverage combine",
     "    coverage html",
     "    coverage report -m --fail-under=100",
@@ -56,7 +57,7 @@ coverage-setenv = [
     ]
 
 [coverage]
-fail-under = 98.7
+fail-under = 98.8
 
 [manifest]
 additional-rules = [

CHANGES.rst

@@ -15,6 +15,8 @@ Features
 - Allow to use the package with Python 3.11 -- Caution: No security audit has
   been done so far.
 
+- Fix code to run on Python 3.11.0b3.
+
 
 5.2 (2021-11-19)
 ----------------

src/RestrictedPython/transformer.py

@@ -64,15 +64,24 @@
 ])
 
 
-# When new ast nodes are generated they have no 'lineno' and 'col_offset'.
-# This function copies these two fields from the incoming node
+# When new ast nodes are generated they have no 'lineno', 'end_lineno',
+# 'col_offset' and 'end_col_offset'. This function copies these fields from the
+# incoming node:
 def copy_locations(new_node, old_node):
     assert 'lineno' in new_node._attributes
     new_node.lineno = old_node.lineno
 
+    if IS_PY38_OR_GREATER:
+        assert 'end_lineno' in new_node._attributes
+        new_node.end_lineno = old_node.end_lineno
+
     assert 'col_offset' in new_node._attributes
     new_node.col_offset = old_node.col_offset
 
+    if IS_PY38_OR_GREATER:
+        assert 'end_col_offset' in new_node._attributes
+        new_node.end_col_offset = old_node.end_col_offset
+
     ast.fix_missing_locations(new_node)
 
 
@@ -427,6 +436,9 @@ def inject_print_collector(self, node, position=0):
             if isinstance(node, ast.Module):
                 _print.lineno = position
                 _print.col_offset = position
+                if IS_PY38_OR_GREATER:
+                    _print.end_lineno = position
+                    _print.end_col_offset = position
                 ast.fix_missing_locations(_print)
             else:
                 copy_locations(_print, node)

tox.ini

@@ -46,6 +46,7 @@ setenv =
     COVERAGE_FILE=.coverage
 commands =
     mkdir -p {toxinidir}/parts/htmlcov
+    coverage erase
     coverage combine
     coverage html
     coverage report -m --fail-under=100
@@ -100,7 +101,7 @@ commands =
     pytest --cov=src --cov=tests --cov-report= {posargs}
     coverage run -a -m sphinx -b doctest -d {envdir}/.cache/doctrees docs {envdir}/.cache/doctest
     coverage html
-    coverage report -m --fail-under=98.7
+    coverage report -m --fail-under=98.8
 
 [coverage:run]
 branch = True