remote changes for python 2.5