Commit3d7b1a5

authored

pythongh-122546: use same filename for different exceptions in new repl (python#123217)

*pythongh-122546: use same filename for different exceptions in new repl* +1

1 parent427b106 commit3d7b1a5Copy full SHA for 3d7b1a5

File tree

+14

-10

lines changed

+14

-10

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ def __init__(`
`162`	`162`	`self.can_colorize=_colorize.can_colorize()`
`163`	`163`
`164`	`164`	`defshowsyntaxerror(self,filename=None,**kwargs):`
`165`		`-super().showsyntaxerror(**kwargs)`
	`165`	`+super().showsyntaxerror(filename=filename,**kwargs)`
`166`	`166`
`167`	`167`	`def_excepthook(self,typ,value,tb):`
`168`	`168`	`importtraceback`

Lines changed: 1 addition & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -109,15 +109,7 @@ def showsyntaxerror(self, filename=None, **kwargs):`
`109`	`109`	`try:`
`110`	`110`	`typ,value,tb=sys.exc_info()`
`111`	`111`	`iffilenameandtypisSyntaxError:`
`112`		`-# Work hard to stuff the correct filename in the exception`
`113`		`-try:`
`114`		`-msg, (dummy_filename,lineno,offset,line)=value.args`
`115`		`-exceptValueError:`
`116`		`-# Not the format we expect; leave it alone`
`117`		`-pass`
`118`		`-else:`
`119`		`-# Stuff in the right filename`
`120`		`-value=SyntaxError(msg, (filename,lineno,offset,line))`
	`112`	`+value.filename=filename`
`121`	`113`	`source=kwargs.pop('source',"")`
`122`	`114`	`self._showtraceback(typ,value,None,source)`
`123`	`115`	`finally:`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1100,6 +1100,16 @@ def test_not_wiping_history_file(self):`
`1100`	`1100`	`self.assertIn("spam",output)`
`1101`	`1101`	`self.assertNotEqual(pathlib.Path(hfile.name).stat().st_size,0)`
`1102`	`1102`
	`1103`	`+@force_not_colorized`
	`1104`	`+deftest_correct_filename_in_syntaxerrors(self):`
	`1105`	`+env=os.environ.copy()`
	`1106`	`+commands="a b c\nexit()\n"`
	`1107`	`+output,exit_code=self.run_repl(commands,env=env)`
	`1108`	`+if"can't use pyrepl"inoutput:`
	`1109`	`+self.skipTest("pyrepl not available")`
	`1110`	`+self.assertIn("SyntaxError: invalid syntax",output)`
	`1111`	`+self.assertIn("<python-input-0>",output)`
	`1112`	`+`
`1103`	`1113`	`@force_not_colorized`
`1104`	`1114`	`deftest_proper_tracebacklimit(self):`
`1105`	`1115`	`env=os.environ.copy()`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Consistently use same file name for different exceptions in the new repl.`
	`2`	`+Patch by Sergey B Kirpichev.`

Comments

(0)