Avoid Py2.5 syntax

'foo' if condition else 'bar' is post-Python-2.5 syntax and while
convenient, just not necessary.
1 file changed