Sorry this isn't a .diff file but I really have no experience using this as well as CSV. The files python.py and utils.py lack some information so I added it. I marked all changed parts by adding a comment. I hope this is useful!
new python.py file
Logged In: NO
sorry I can't provide the utils.py file, but SF only lets me upload one file :( Anyway, in utils.py I added only one line: PYTHON_2_5 = 0x20500
I tested this value on a python 2.5 installation and it works as expected.
Logged In: YES
I already added the utils.py fix for 2.5. Some of these were done. I added a bunch of the other issues from this patch. I'm leaving this open so I can go back and finish adding all the deprecations which are all that's left here.