A stab at supporting Python 3.x