GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — bpo-45249: Ensure the traceback module prints correctly syntax errors… · python/cpython@c7fdd68

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

Lib
- test
  - test_traceback.py
- traceback.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎Lib/test/test_traceback.py‎`

Copy file name to clipboardExpand all lines: Lib/test/test_traceback.py

+13Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,9 @@ def syntax_error_with_caret(self):`
`39`	`39`	`def syntax_error_with_caret_2(self):`
`40`	`40`	`compile("1 +\n", "?", "exec")`
`41`	`41`
	`42`	`+ def syntax_error_with_caret_range(self):`
	`43`	`+ compile("f(x, y for y in range(30), z)", "?", "exec")`
	`44`	`+`
`42`	`45`	`def syntax_error_bad_indentation(self):`
`43`	`46`	`compile("def spam():\n print(1)\n print(2)", "?", "exec")`
`44`	`47`
`@@ -55,18 +58,28 @@ def test_caret(self):`
`55`	`58`	`self.assertTrue(err[1].strip() == "return x!")`
`56`	`59`	`self.assertIn("^", err[2]) # third line has caret`
`57`	`60`	`self.assertEqual(err[1].find("!"), err[2].find("^")) # in the right place`
	`61`	`+ self.assertEqual(err[2].count("^"), 1)`
`58`	`62`
`59`	`63`	`err = self.get_exception_format(self.syntax_error_with_caret_2,`
`60`	`64`	`SyntaxError)`
`61`	`65`	`self.assertIn("^", err[2]) # third line has caret`
`62`	`66`	`self.assertEqual(err[2].count('\n'), 1) # and no additional newline`
`63`	`67`	`self.assertEqual(err[1].find("+") + 1, err[2].find("^")) # in the right place`
	`68`	`+ self.assertEqual(err[2].count("^"), 1)`
`64`	`69`
`65`	`70`	`err = self.get_exception_format(self.syntax_error_with_caret_non_ascii,`
`66`	`71`	`SyntaxError)`
`67`	`72`	`self.assertIn("^", err[2]) # third line has caret`
`68`	`73`	`self.assertEqual(err[2].count('\n'), 1) # and no additional newline`
`69`	`74`	`self.assertEqual(err[1].find("+") + 1, err[2].find("^")) # in the right place`
	`75`	`+ self.assertEqual(err[2].count("^"), 1)`
	`76`	`+`
	`77`	`+ err = self.get_exception_format(self.syntax_error_with_caret_range,`
	`78`	`+ SyntaxError)`
	`79`	`+ self.assertIn("^", err[2]) # third line has caret`
	`80`	`+ self.assertEqual(err[2].count('\n'), 1) # and no additional newline`
	`81`	`+ self.assertEqual(err[1].find("y"), err[2].find("^")) # in the right place`
	`82`	`+ self.assertEqual(err[2].count("^"), len("y for y in range(30)"))`
`70`	`83`
`71`	`84`	`def test_nocaret(self):`
`72`	`85`	`exc = SyntaxError("error", ("x.py", 23, None, "bad syntax"))`

Collapse file

`‎Lib/traceback.py‎`

Copy file name to clipboardExpand all lines: Lib/traceback.py

+21-6Lines changed: 21 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -475,10 +475,14 @@ class TracebackException:`
`475`	`475`	`occurred.`
`476`	`476`	- :attr:`lineno` For syntax errors - the linenumber where the error
`477`	`477`	`occurred.`
	`478`	+ - :attr:`end_lineno` For syntax errors - the end linenumber where the error
	`479`	+ occurred. Can be `None` if not present.
`478`	`480`	- :attr:`text` For syntax errors - the text where the error
`479`	`481`	`occurred.`
`480`	`482`	- :attr:`offset` For syntax errors - the offset into the text where the
`481`	`483`	`error occurred.`
	`484`	+ - :attr:`end_offset` For syntax errors - the offset into the text where the
	`485`	+ error occurred. Can be `None` if not present.
`482`	`486`	- :attr:`msg` For syntax errors - the compiler error message.
`483`	`487`	`"""`
`484`	`488`
`@@ -507,8 +511,11 @@ def __init__(self, exc_type, exc_value, exc_traceback, *, limit=None,`
`507`	`511`	`self.filename = exc_value.filename`
`508`	`512`	`lno = exc_value.lineno`
`509`	`513`	`self.lineno = str(lno) if lno is not None else None`
	`514`	`+ end_lno = exc_value.end_lineno`
	`515`	`+ self.end_lineno = str(end_lno) if end_lno is not None else None`
`510`	`516`	`self.text = exc_value.text`
`511`	`517`	`self.offset = exc_value.offset`
	`518`	`+ self.end_offset = exc_value.end_offset`
`512`	`519`	`self.msg = exc_value.msg`
`513`	`520`	`if lookup_lines:`
`514`	`521`	`self._load_lines()`
`@@ -623,12 +630,20 @@ def _format_syntax_error(self, stype):`
`623`	`630`	`ltext = rtext.lstrip(' \n\f')`
`624`	`631`	`spaces = len(rtext) - len(ltext)`
`625`	`632`	`yield ' {}\n'.format(ltext)`
`626`		`- # Convert 1-based column offset to 0-based index into stripped text`
`627`		`- caret = (self.offset or 0) - 1 - spaces`
`628`		`- if caret >= 0:`
`629`		`- # non-space whitespace (likes tabs) must be kept for alignment`
`630`		`- caretspace = ((c if c.isspace() else ' ') for c in ltext[:caret])`
`631`		`- yield ' {}^\n'.format(''.join(caretspace))`
	`633`	`+`
	`634`	`+ if self.offset is not None:`
	`635`	`+ offset = self.offset`
	`636`	`+ end_offset = self.end_offset if self.end_offset is not None else offset`
	`637`	`+ if offset == end_offset or end_offset == -1:`
	`638`	`+ end_offset = offset + 1`
	`639`	`+`
	`640`	`+ # Convert 1-based column offset to 0-based index into stripped text`
	`641`	`+ colno = offset - 1 - spaces`
	`642`	`+ end_colno = end_offset - 1 - spaces`
	`643`	`+ if colno >= 0:`
	`644`	`+ # non-space whitespace (likes tabs) must be kept for alignment`
	`645`	`+ caretspace = ((c if c.isspace() else ' ') for c in ltext[:colno])`
	`646`	`+ yield ' {}{}'.format("".join(caretspace), ('^' * (end_colno - colno) + "\n"))`
`632`	`647`	`msg = self.msg or "<no detail available>"`
`633`	`648`	`yield "{}: {}{}\n".format(stype, msg, filename_suffix)`
`634`	`649`

0 commit comments

Comments

0 (0)

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.