Fix handling of format strings to work with python 2.6