use "val1 if cond else val2" instead of "cond and val1 or val2"

[Kun Huang]

"cond and val1 or val2"
This is an old conditional expression and it's hard to understand because only when val1 is False it will return val2.

Using "val1 if cond else val2" is much understandable.

More talks here:

[0] http://stackoverflow.com/questions/394809/ternary-conditional-operator-in-python
[1] http://www.python.org/dev/peps/pep-0308/

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/31943

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/31943
Committed: http://github.com/openstack/swift/commit/157f61651ea740cf6d827a3ce82f153b6fcd1e6e
Submitter: Jenkins
Branch: master

commit 157f61651ea740cf6d827a3ce82f153b6fcd1e6e
Author: Kun Huang <email address hidden>
Date: Thu Jun 6 17:59:31 2013 +0800

    Remove <cond> and <val1> or <val2> systax

    Use <val1> if <cond> else <val2> instead.
    There're more talks:
    [0] http://stackoverflow.com/questions/394809/ternary-conditional-operator-in-python
    [1] http://www.python.org/dev/peps/pep-0308/

    Fixes bug 1188111

    Change-Id: I485e674317faf319a26ab30c2c193d8464a7e46e