Merge pull request #194 from mgorny/python310

Update expected exception line numbers for Python 3.10.0rc1
This commit is contained in:
Dave Halter
2021-08-06 18:09:00 +02:00
committed by GitHub

View File

@@ -57,10 +57,10 @@ def test_non_async_in_async():
error, = errors error, = errors
actual = error.message actual = error.message
assert actual in wanted assert actual in wanted
if sys.version_info[:2] < (3, 8): if sys.version_info[:2] not in ((3, 8), (3, 9)):
assert line_nr == error.start_pos[0] assert line_nr == error.start_pos[0]
else: else:
assert line_nr == 0 # For whatever reason this is zero in Python 3.8+ assert line_nr == 0 # For whatever reason this is zero in Python 3.8/3.9
@pytest.mark.parametrize( @pytest.mark.parametrize(
@@ -140,12 +140,15 @@ def _get_actual_exception(code):
def test_default_except_error_postition(): def test_default_except_error_postition():
# For this error the position seemed to be one line off, but that doesn't # For this error the position seemed to be one line off in Python < 3.10,
# really matter. # but that doesn't really matter.
code = 'try: pass\nexcept: pass\nexcept X: pass' code = 'try: pass\nexcept: pass\nexcept X: pass'
wanted, line_nr = _get_actual_exception(code) wanted, line_nr = _get_actual_exception(code)
error, = _get_error_list(code) error, = _get_error_list(code)
assert error.message in wanted assert error.message in wanted
if sys.version_info[:2] >= (3, 10):
assert line_nr == error.start_pos[0]
else:
assert line_nr != error.start_pos[0] assert line_nr != error.start_pos[0]
# I think this is the better position. # I think this is the better position.
assert error.start_pos[0] == 2 assert error.start_pos[0] == 2