Logged In: YES 
user_id=33168

I had the same question as pje wrt to his second comment
about module.__name__ (assuming this is the same patch
posted to python-dev).  I would rather use the version
currently checked in to minimize change and maximize the
testing.  Please add a comments describing why one is chosen
rather than the other.  Also adding a comment in the code
about pje's items comment below would be nice.

Is this the attached version the same one Ralf (or whoever)
said fixed the problem?