Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-126139: Improve error message location for future statement with unknown feature (#126140)

This commit is contained in:
Brian Schubert 2024-10-29 19:57:59 -04:00 committed by GitHub
parent 9dfef4e5f4
commit 224c370a36
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/test/test_exceptions.py
View File

@ -319,8 +319,8 @@ class ExceptionTests(unittest.TestCase):
check('def f():\n global x\n nonlocal x', 2, 3)
# Errors thrown by future.c
check('from __future__ import doesnt_exist', 1, 1)
check('from __future__ import braces', 1, 1)
check('from __future__ import doesnt_exist', 1, 24)
check('from __future__ import braces', 1, 24)
check('x=1\nfrom __future__ import division', 2, 1)
check('foo(1=2)', 1, 5)
check('def f():\n x, y: int', 2, 3)

8
Lib/test/test_future_stmt/test_future.py
View File

@ -88,7 +88,7 @@ class FutureTest(unittest.TestCase):
"""
self.assertSyntaxError(
code, lineno=2,
message='future feature rested_snopes is not defined',
message='future feature rested_snopes is not defined', offset=24,
)
def test_future_import_not_on_top(self):
@ -137,19 +137,19 @@ class FutureTest(unittest.TestCase):
code = """
from __future__ import *
"""
self.assertSyntaxError(code, message='future feature * is not defined')
self.assertSyntaxError(code, message='future feature * is not defined', offset=24)
def test_future_import_braces(self):
code = """
from __future__ import braces
"""
# Congrats, you found an easter egg!
self.assertSyntaxError(code, message='not a chance')
self.assertSyntaxError(code, message='not a chance', offset=24)
code = """
from __future__ import nested_scopes, braces
"""
self.assertSyntaxError(code, message='not a chance')
self.assertSyntaxError(code, message='not a chance', offset=39)
def test_module_with_future_import_not_on_top(self):
with self.assertRaises(SyntaxError) as cm:

2
Misc/NEWS.d/next/Core_and_Builtins/2024-10-29-15-17-31.gh-issue-126139.B4OQ8a.rst Normal file
View File

@ -0,0 +1,2 @@
Provide better error location when attempting to use a :term:`future
statement <__future__>` with an unknown future feature.

12
Python/future.c
View File

@ -41,12 +41,20 @@ future_check_features(_PyFutureFeatures *ff, stmt_ty s, PyObject *filename)
} else if (strcmp(feature, "braces") == 0) {
PyErr_SetString(PyExc_SyntaxError,
"not a chance");
PyErr_SyntaxLocationObject(filename, s->lineno, s->col_offset + 1);
PyErr_RangedSyntaxLocationObject(filename,
name->lineno,
name->col_offset + 1,
name->end_lineno,
name->end_col_offset + 1);
return 0;
} else {
PyErr_Format(PyExc_SyntaxError,
UNDEFINED_FUTURE_FEATURE, feature);
PyErr_SyntaxLocationObject(filename, s->lineno, s->col_offset + 1);
PyErr_RangedSyntaxLocationObject(filename,
name->lineno,
name->col_offset + 1,
name->end_lineno,
name->end_col_offset + 1);
return 0;
}
}