Revision 1868880

Merge r1868151 from trunk:

 * r1868151
   Fix syntax error when $PYTHON is Python 3.
   Justification:
     Python 2 will reach EOL during the lifetime of this branch.
   Votes:
     +1: danielsh
     +0: julianfoad (reviewed only)