Commitc4a19c1

committed

Make sure convert works without nose.

1 parentd379ef6 commitc4a19c1Copy full SHA for c4a19c1

File tree

-2

lines changed

-2

lines changed

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -174,8 +174,14 @@ def convert(filename, cache):`
`174`	`174`	`"""`
`175`	`175`	`base,extension=filename.rsplit('.',1)`
`176`	`176`	`ifextensionnotinconverter:`
`177`		`-fromnoseimportSkipTest`
`178`		`-raiseSkipTest("Don't know how to convert %s files to png"%extension)`
	`177`	`+reason="Don't know how to convert %s files to png"%extension`
	`178`	`+from .importis_called_from_pytest`
	`179`	`+ifis_called_from_pytest():`
	`180`	`+importpytest`
	`181`	`+pytest.skip(reason)`
	`182`	`+else:`
	`183`	`+fromnoseimportSkipTest`
	`184`	`+raiseSkipTest(reason)`
`179`	`185`	`newname=base+'_'+extension+'.png'`
`180`	`186`	`ifnotos.path.exists(filename):`
`181`	`187`	`raiseIOError("'%s' does not exist"%filename)`

Comments

(0)