WIP: Fixing ordereddict and format string for py26