mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 22:18:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

bpo-34084: Fix setting an error message for the "Barry as BDFL" easter egg. (GH-8262)

Browse source
This commit is contained in:
Serhiy Storchaka 2018-07-23 23:41:11 +03:00 • committed by GitHub
parent db8e3a1e44
commit aba24ff360
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Lib/test/test_flufl.py
View file

@ -4,18 +4,29 @@ import unittest
class FLUFLTests(unittest.TestCase): class FLUFLTests(unittest.TestCase):
def test_barry_as_bdfl(self): def test_barry_as_bdfl(self):
code = "from __future__ import barry_as_FLUFL; 2 {0} 3" code = "from __future__ import barry_as_FLUFL\n2 {0} 3"
compile(code.format('<>'), '<BDFL test>', 'exec', compile(code.format('<>'), '<BDFL test>', 'exec',
__future__.CO_FUTURE_BARRY_AS_BDFL) __future__.CO_FUTURE_BARRY_AS_BDFL)
self.assertRaises(SyntaxError, compile, code.format('!='), with self.assertRaises(SyntaxError) as cm:
'<FLUFL test>', 'exec', compile(code.format('!='), '<FLUFL test>', 'exec',
__future__.CO_FUTURE_BARRY_AS_BDFL) __future__.CO_FUTURE_BARRY_AS_BDFL)
self.assertRegex(str(cm.exception),
"with Barry as BDFL, use '<>' instead of '!='")
self.assertEqual(cm.exception.text, '2 != 3\n')
self.assertEqual(cm.exception.filename, '<FLUFL test>')
self.assertEqual(cm.exception.lineno, 2)
self.assertEqual(cm.exception.offset, 4)
def test_guido_as_bdfl(self): def test_guido_as_bdfl(self):
code = '2 {0} 3' code = '2 {0} 3'
compile(code.format('!='), '<BDFL test>', 'exec') compile(code.format('!='), '<BDFL test>', 'exec')
self.assertRaises(SyntaxError, compile, code.format('<>'), with self.assertRaises(SyntaxError) as cm:
'<FLUFL test>', 'exec') compile(code.format('<>'), '<FLUFL test>', 'exec')
self.assertRegex(str(cm.exception), "invalid syntax")
self.assertEqual(cm.exception.text, '2 <> 3\n')
self.assertEqual(cm.exception.filename, '<FLUFL test>')
self.assertEqual(cm.exception.lineno, 1)
self.assertEqual(cm.exception.offset, 4)
if __name__ == '__main__': if __name__ == '__main__':

3
Parser/parsetok.c
View file

@ -246,8 +246,7 @@ parsetok(struct tok_state *tok, grammar *g, int start, perrdetail *err_ret,
else if ((ps->p_flags & CO_FUTURE_BARRY_AS_BDFL) && else if ((ps->p_flags & CO_FUTURE_BARRY_AS_BDFL) &&
strcmp(str, "<>")) { strcmp(str, "<>")) {
PyObject_FREE(str); PyObject_FREE(str);
err_ret->text = "with Barry as BDFL, use '<>' " err_ret->expected = NOTEQUAL;
"instead of '!='";
err_ret->error = E_SYNTAX; err_ret->error = E_SYNTAX;
break; break;
} }

4
Python/pythonrun.c
View file

@ -1348,6 +1348,10 @@ err_input(perrdetail *err)
msg = "unexpected indent"; msg = "unexpected indent";
else if (err->token == DEDENT) else if (err->token == DEDENT)
msg = "unexpected unindent"; msg = "unexpected unindent";
else if (err->expected == NOTEQUAL) {
errtype = PyExc_SyntaxError;
msg = "with Barry as BDFL, use '<>' instead of '!='";
}
else { else {
errtype = PyExc_SyntaxError; errtype = PyExc_SyntaxError;
msg = "invalid syntax"; msg = "invalid syntax";