To fix urllib.py or urllib2.py?

[Steve]

Hi,

There are some outstanding issues with proxy handling in urllib.py in
Python 1.5.2.  Specifically, parsing of usernames and passwords in the
proxy url are not handled correctly (see bug 221 in incoming), and the
authorisation info is being passed to the proxy incorrectly (should be
using 'Proxy-Authorization:' header).

I have fixed these locally in urllib.py in 1.5.2, and I want to submit
a patch against CVS, as there's no sign of these having been fixed
there.  However, there is now a new urllib, Jeremy Hylton's urllib2.py
under CVS.  Can anybody tell me which one I should be working against?
Is the new one destined to be the definitive version, or should I
patch both for the time being?

Thanks,
Steve