Logged In: YES 
user_id=89016

diff2.txt is a new version of the patch (against current CVS).

I rechecked the fixheader fix with:
for i in xrange(256):
   c = chr(i)
   if (ord(c)<=0x80 and c.isalnum()) != (c in
string.ascii_letters + string.digits): 
      print i,c
There are no differences.

> In file:  pathfix.py
> Replace:  if line.find("python") < 0:
> With:  if "python" in line:

This should probably be:
    if "python" not in line:

> In file:  texi2html.py
> I don't understand the <<<<<< additions

Ouch, that was a merge conflict.

OK, Raymond could you recheck if the new patch diff2.txt is
OK now? These mindless changes really are tricky! ;)

Unfortunately running the scripts isn't an option in most
cases: Some require Tk, some might expect certain files and
some might even transmogrify all the source files.

I changed a few tests
   line[:x] == "xxx...xxx"
to
   line.startswith("xxx...xxx")
too.

I rechecked the _find = string.find cases in idle/PyParse.py
and script/gencodec.py.

If I'll get your OK I'll check this in.