Python 2.4 doesn't have ternary ifs :-(
Merge pull request #184 from reversefold/PYTHON-436_reintegrate

Python 2.4 doesn't have ternary ifs :-(