[Python-checkins] [Python-3000] buildbot failure in ppc Debian unstable 3.0

[Bill Janssen]

> I can't run the ssl tests with -unetwork on my machine. Could somebody
> please fix the test for me?
> 
> Christian

I see at least three "merges from the trunk" since I last touched it
in December.  If you revert these (to Lib/ssl.py, Modules/_ssl.c, and
Lib/test/test_ssl.py), I'll bet things will work again.  The trunk of
ssl is out-of-date with regard to 3k.  We need to merge backward, not
forward.  Time to fix this (in the trunk).

Why not revert these, and I understand there's some way of marking
files to not be merged, now?  Please so mark these three files, and
when it's working in 2.6 again, we can remove the marks.

Bill