Commit30f943f

committed

Replace str(e) with "%s" % e where possible (fixes#501)

Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>

1 parent25c2fe0 commit30f943fCopy full SHA for 30f943f

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -562,7 +562,7 @@ def process_control_event(self, e):`
`562`	`562`	`self.startup()`
`563`	`563`	`exceptIOErrorase:`
`564`	`564`	`self.status_bar.message(`
`565`		`-_('Executing PYTHONSTARTUP failed: %s')% (str(e)))`
	`565`	`+_('Executing PYTHONSTARTUP failed: %s')% (e,))`
`566`	`566`
`567`	`567`	`elifisinstance(e,bpythonevents.UndoEvent):`
`568`	`568`	`self.undo(n=e.n)`
`@@ -1532,7 +1532,7 @@ def show_source(self):`
`1532`	`1532`	`try:`
`1533`	`1533`	`source=self.get_source_of_current_name()`
`1534`	`1534`	`exceptSourceNotFoundase:`
`1535`		`-self.status_bar.message(str(e))`
	`1535`	`+self.status_bar.message('%s'% (e,))`
`1536`	`1536`	`else:`
`1537`	`1537`	`ifself.config.highlight_show_source:`
`1538`	`1538`	`source=format(PythonLexer().get_tokens(source),`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -545,11 +545,11 @@ def get_source_of_current_name(self):`
`545`	`545`	`obj=self.get_object(line)`
`546`	`546`	`returninspection.get_source_unicode(obj)`
`547`	`547`	`except (AttributeError,NameError)ase:`
`548`		`-msg=_("Cannot get source: %s")% (str(e), )`
	`548`	`+msg=_(u"Cannot get source: %s")% (e, )`
`549`	`549`	`exceptIOErrorase:`
`550`		`-msg=str(e)`
	`550`	`+msg=u"%s"% (e,)`
`551`	`551`	`exceptTypeErrorase:`
`552`		`-if"built-in"instr(e):`
	`552`	`+if"built-in"inu"%s"% (e,):`
`553`	`553`	`msg=_("Cannot access source of %r")% (obj, )`
`554`	`554`	`else:`
`555`	`555`	`msg=_("No source code found for %s")% (self.current_line, )`

Comments

(0)