[1.2.X] Fixed #15543 -- Tweaked change from r15696 to not use 'if' syntax...

[1.2.X] Fixed #15543 -- Tweaked change from r15696 to not use 'if' syntax introduce in Python 2.5. Thanks to an anonymous reporter for the heads up.

Backport of [15731] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15732 bcc190cf-cafb-0310-a4f2-bffc1f526a37