Commit0a14bac

committed

Moved used_x_to_multiply into check() because syntax errors cause early return before checking message steps

1 parentbee2659 commit0a14bacCopy full SHA for 0a14bac

File tree

+13

-23

lines changed

+13

-23

lines changed

Lines changed: 13 additions & 23 deletions

Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,19 @@ class times_table_exercise(ExerciseStep):`
`124`	`124`
`125`	`125`	`parsons_solution=True`
`126`	`126`
	`127`	`+defcheck(self):`
	`128`	`+try:`
	`129`	`+returnsuper().check()`
	`130`	`+exceptSyntaxError:`
	`131`	`+lines=self.result.splitlines()`
	`132`	`+if (`
	`133`	`+len(lines)>=3`
	`134`	`+andlines[2].strip()=="SyntaxError: invalid syntax"`
	`135`	`+andlines[1].strip()=="^"`
	`136`	`+andlines[0][lines[1].index("^")]=="x"`
	`137`	`+ ):`
	`138`	+returndict(message="To multiply numbers, use `*`")
	`139`	`+`
`127`	`140`	`defsolution(self):`
`128`	`141`	`forleftinrange(12):`
`129`	`142`	`left+=1`
`@@ -177,29 +190,6 @@ def program(self):`
`177`	`190`	`defcheck(self):`
`178`	`191`	`return"TypeError: unsupported operand type(s) for +: "inself.result`
`179`	`192`
`180`		`-classused_x_to_multiply(MessageStep):`
`181`		-"""To multiply numbers, use `*`"""
`182`		`-`
`183`		`-program="2 x 3"`
`184`		`-`
`185`		`-defcheck(self):`
`186`		`-"""`
`187`		`- Check for a traceback like:`
`188`		`- 2 x 3`
`189`		`- ^`
`190`		`- SyntaxError: invalid syntax`
`191`		`-`
`192`		`- It might be better to try replacing x with * and see if`
`193`		`- it becomes valid syntax`
`194`		`- """`
`195`		`-lines=self.result.strip().splitlines()`
`196`		`-return (`
`197`		`-len(lines)>=3and`
`198`		`-lines[-1]=="SyntaxError: invalid syntax"and`
`199`		`-lines[-2].strip()=="^"and`
`200`		`-lines[-3][lines[-2].index("^")]=="x"`
`201`		`- )`
`202`		`-`
`203`	`193`	`tests= {`
`204`	`194`	`():"""\`
`205`	`195`	`1 x 1 = 1`

Comments

(0)