Fix up Python 2.6 and Python 3.2 compatibility