p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Module docstrings in 3.7 are not part of Module node anymore 

Fixes https://github.com/pytest-dev/pytest/issues/3530
This commit is contained in:
Miro Hrončok 2018-06-04 12:50:31 +02:00
parent d609b635f4
commit 9a6fa33c69
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/3530.trivial.rst Normal file
View File

@ -0,0 +1 @@
Fix if in tests to support 3.7.0b5, where a docstring handling in AST got reverted.

30
testing/test_assertrewrite.py
View File

@ -65,15 +65,31 @@ def getmsg(f, extra_ns=None, must_pass=False):
pytest.fail("function didn't raise at all") pytest.fail("function didn't raise at all")
def python_version_has_docstring_in_module_node():
"""Module docstrings in 3.8 are part of Module node.
This was briefly in 3.7 as well but got reverted in beta 5.
TODO:
We have a complicated sys.version_info if in here to ease testing on
various Python 3.7 versions, but we should remove the 3.7 check after
3.7 is released as stable to make this check more straightforward.
"""
return (
sys.version_info < (3, 8)
and not ((3, 7) <= sys.version_info <= (3, 7, 0, "beta", 4))
)
class TestAssertionRewrite(object): class TestAssertionRewrite(object):
def test_place_initial_imports(self): def test_place_initial_imports(self):
s = """'Doc string'\nother = stuff""" s = """'Doc string'\nother = stuff"""
m = rewrite(s) m = rewrite(s)
# Module docstrings in 3.7 are part of Module node, it's not in the body # Module docstrings in some new Python versions are part of Module node
# so we remove it so the following body items have the same indexes on # It's not in the body so we remove it so the following body items have
# all Python versions # the same indexes on all Python versions:
if sys.version_info < (3, 7): if python_version_has_docstring_in_module_node():
assert isinstance(m.body[0], ast.Expr) assert isinstance(m.body[0], ast.Expr)
assert isinstance(m.body[0].value, ast.Str) assert isinstance(m.body[0].value, ast.Str)
del m.body[0] del m.body[0]
@ -92,7 +108,7 @@ class TestAssertionRewrite(object):
assert isinstance(m.body[3], ast.Expr) assert isinstance(m.body[3], ast.Expr)
s = """'doc string'\nfrom __future__ import with_statement""" s = """'doc string'\nfrom __future__ import with_statement"""
m = rewrite(s) m = rewrite(s)
if sys.version_info < (3, 7): if python_version_has_docstring_in_module_node():
assert isinstance(m.body[0], ast.Expr) assert isinstance(m.body[0], ast.Expr)
assert isinstance(m.body[0].value, ast.Str) assert isinstance(m.body[0].value, ast.Str)
del m.body[0] del m.body[0]
@ -103,7 +119,7 @@ class TestAssertionRewrite(object):
assert imp.col_offset == 0 assert imp.col_offset == 0
s = """'doc string'\nfrom __future__ import with_statement\nother""" s = """'doc string'\nfrom __future__ import with_statement\nother"""
m = rewrite(s) m = rewrite(s)
if sys.version_info < (3, 7): if python_version_has_docstring_in_module_node():
assert isinstance(m.body[0], ast.Expr) assert isinstance(m.body[0], ast.Expr)
assert isinstance(m.body[0].value, ast.Str) assert isinstance(m.body[0].value, ast.Str)
del m.body[0] del m.body[0]
@ -124,7 +140,7 @@ class TestAssertionRewrite(object):
def test_dont_rewrite(self): def test_dont_rewrite(self):
s = """'PYTEST_DONT_REWRITE'\nassert 14""" s = """'PYTEST_DONT_REWRITE'\nassert 14"""
m = rewrite(s) m = rewrite(s)
if sys.version_info < (3, 7): if python_version_has_docstring_in_module_node():
assert len(m.body) == 2 assert len(m.body) == 2
assert isinstance(m.body[0], ast.Expr) assert isinstance(m.body[0], ast.Expr)
assert isinstance(m.body[0].value, ast.Str) assert isinstance(m.body[0].value, ast.Str)