Skip to content

Commit

Permalink
Fix assertion rewriting on Python 3.10
Browse files Browse the repository at this point in the history
Fixes pytest-dev#8539

This seems to have been the result of https://bugs.python.org/issue43798
  • Loading branch information
hauntsaninja committed Apr 11, 2021
1 parent 9653a0e commit 8be1628
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 4 deletions.
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,7 @@ Sankt Petersbug
Segev Finer
Serhii Mozghovyi
Seth Junot
Shantanu Jain
Shubham Adep
Simon Gomizelj
Simon Kerr
Expand Down
1 change: 1 addition & 0 deletions changelog/8539.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed assertion rewriting on Python 3.10.
18 changes: 14 additions & 4 deletions src/_pytest/assertion/rewrite.py
Original file line number Diff line number Diff line change
Expand Up @@ -684,12 +684,9 @@ def run(self, mod: ast.Module) -> None:
if not mod.body:
# Nothing to do.
return

# Insert some special imports at the top of the module but after any
# docstrings and __future__ imports.
aliases = [
ast.alias("builtins", "@py_builtins"),
ast.alias("_pytest.assertion.rewrite", "@pytest_ar"),
]
doc = getattr(mod, "docstring", None)
expect_docstring = doc is None
if doc is not None and self.is_rewrite_disabled(doc):
Expand Down Expand Up @@ -721,6 +718,19 @@ def run(self, mod: ast.Module) -> None:
lineno = item.decorator_list[0].lineno
else:
lineno = item.lineno
if sys.version_info >= (3, 10):
aliases = [
ast.alias("builtins", "@py_builtins", lineno=lineno, col_offset=0),
ast.alias(
"_pytest.assertion.rewrite", "@pytest_ar",
lineno=lineno, col_offset=0
),
]
else:
aliases = [
ast.alias("builtins", "@py_builtins"),
ast.alias("_pytest.assertion.rewrite", "@pytest_ar"),
]
imports = [
ast.Import([alias], lineno=lineno, col_offset=0) for alias in aliases
]
Expand Down

0 comments on commit 8be1628

Please sign in to comment.