Commitbe3b42b

committed

More robust check in more_calculation step

1 parentc734221 commitbe3b42bCopy full SHA for be3b42b

File tree

+14

-11

lines changed

+14

-11

lines changed

Lines changed: 14 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
`1`	`1`	`# flake8: NOQA E501`
`2`		`-frommain.textimportMessageStep,Page,Step,VerbatimStep`
	`2`	`+importast`
	`3`	`+fromtextwrapimportdedent`
	`4`	`+`
	`5`	`+frommain.textimportMessageStep,Page,Step,VerbatimStep,search_ast`
`3`	`6`
`4`	`7`
`5`	`8`	`classIntroducingTheShell(Page):`
`@@ -37,20 +40,20 @@ class more_calculation(Step):`
`37`	`40`
`38`	`41`	`program="5 - 6"`
`39`	`42`
`40`		`-classx_to_multiple(MessageStep):`
`41`		`-"""`
	`43`	`+defcheck(self):`
	`44`	`+try:`
	`45`	`+returnsearch_ast(self.stmt, (ast.Mult,ast.Div,ast.Sub))`
	`46`	`+exceptSyntaxError:`
	`47`	`+if"x"inself.input:`
	`48`	`+returndict(`
	`49`	`+message=dedent(`
	`50`	`+"""`
`42`	`51`	`I see an 'x'. If you're trying to multiply, use an asterisk, e.g:`
`43`	`52`
`44`	`53`	`3 * 4`
`45`	`54`	`"""`
`46`		`-`
`47`		`-program="3 x 4"`
`48`		`-`
`49`		`-defcheck(self):`
`50`		`-return"x"inself.input`
`51`		`-`
`52`		`-defcheck(self):`
`53`		`-returnself.input_matches(r"\d[-*/]\d")`
	`55`	`+ )`
	`56`	`+ )`
`54`	`57`
`55`	`58`	`final_text="""`
`56`	`59`	`Excellent! Keep experimenting. When you're ready, click 'Next' to continue.`

Comments

(0)