Adaptation to Python 3.x