fix the bugs introduced by 2to3
Merge branch 'master' of https://github.com/terryyin/hfcca