commit 220afffb683af1ba9e04c37535cfaa41348e9ebb
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Mon Jul 23 15:41:26 2018 -0700
committer Serhiy Storchaka <storchaka@gmail.com> Tue Jul 24 01:41:26 2018 +0300
tree c81c0b44425334c7fdb503aca10c62fa1d6ba1e6
parent 519fc551d7778ac698033846bb052a12b7d491e2

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

(cherry picked from commit aba24ff3601ddc86b85e01880a8be596fb799287)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

Lib/test/test_flufl.py

diff --git a/Lib/test/test_flufl.py b/Lib/test/test_flufl.py
index 98b5bd6..33e52e6 100644
--- a/Lib/test/test_flufl.py
+++ b/Lib/test/test_flufl.py
@@ -4,18 +4,29 @@
 class FLUFLTests(unittest.TestCase):
 
     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',
                 __future__.CO_FUTURE_BARRY_AS_BDFL)
-        self.assertRaises(SyntaxError, compile, code.format('!='),
-                            '<FLUFL test>', 'exec',
-                            __future__.CO_FUTURE_BARRY_AS_BDFL)
+        with self.assertRaises(SyntaxError) as cm:
+            compile(code.format('!='), '<FLUFL test>', 'exec',
+                    __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):
         code = '2 {0} 3'
         compile(code.format('!='), '<BDFL test>', 'exec')
-        self.assertRaises(SyntaxError, compile, code.format('<>'),
-                            '<FLUFL test>', 'exec')
+        with self.assertRaises(SyntaxError) as cm:
+            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__':