adapted to python-mode changes