Re: [Python-3000] Merging the trunk SSL changes.

2007-08-28 Thread Guido van Rossum
Yes, that makes more sense. Bah, three revisions for one. On 8/28/07, Bill Janssen <[EMAIL PROTECTED]> wrote: > > Until ssl.py is fixed, I've added quick hacks to test_ssl.py and > > test_socket_ssl.py to disable these tests, so people won't be alarmed > > by the test failures. > > You might just

Re: [Python-3000] Merging the trunk SSL changes.

2007-08-28 Thread Bill Janssen
> Until ssl.py is fixed, I've added quick hacks to test_ssl.py and > test_socket_ssl.py to disable these tests, so people won't be alarmed > by the test failures. You might just want to configure out SSL support, or have Lib/ssl.py raise an ImportError, for the moment. Bill __

Re: [Python-3000] Merging the trunk SSL changes.

2007-08-28 Thread Guido van Rossum
On 8/28/07, Bill Janssen <[EMAIL PROTECTED]> wrote: > > > If you can hold off one day before doing the trunk merge, I'm going to > > > post a fix to the Windows SSL breakage this evening (PDT). > > > > > > Too late, sorry, it's already checked in. You can revert the SSL bits if you > > want, and ta

Re: [Python-3000] Merging the trunk SSL changes.

2007-08-28 Thread Bill Janssen
> > If you can hold off one day before doing the trunk merge, I'm going to > > post a fix to the Windows SSL breakage this evening (PDT). > > > Too late, sorry, it's already checked in. You can revert the SSL bits if you > want, and take care to merge the proper changes later. No, that's OK. I'

Re: [Python-3000] Merging the trunk SSL changes.

2007-08-28 Thread Thomas Wouters
On 8/29/07, Bill Janssen <[EMAIL PROTECTED]> wrote: > If you can hold off one day before doing the trunk merge, I'm going to > post a fix to the Windows SSL breakage this evening (PDT). Too late, sorry, it's already checked in. You can revert the SSL bits if you want, and take care to merge the

Re: [Python-3000] Merging the trunk SSL changes.

2007-08-28 Thread Bill Janssen
> I'm trying to merge the trunk into the py3k branch (so I can work on > removing simple slices), but the SSL changes in the trunk are in the way. > That is to say, the new 'ssl' module depends on the Python 2.x layout in the > 'socket' module. Specifically, that socket.socket is a wrapper class ar

[Python-3000] Merging the trunk SSL changes.

2007-08-28 Thread Thomas Wouters
I'm trying to merge the trunk into the py3k branch (so I can work on removing simple slices), but the SSL changes in the trunk are in the way. That is to say, the new 'ssl' module depends on the Python 2.x layout in the 'socket' module. Specifically, that socket.socket is a wrapper class around _so