Do not use construct not compatible with python 2.4, fix #5006
Merge pull request #5015 from mscherer/fix_5006

Do not use construct not compatible with python 2.4, fix #5006