changed some inline conditional to block conditionals for python 2.4 com...

...patability