fix python 2.6 compatibility
17 files changed