Message1667

Ok, I've implemented a better solution than doing a copy.copy (socket_fileobject2-r3591.diff):

o replace usage of PyFile in socket.makefile with the pure python file-like
socket._fileobject from CPython 2.4.4. fixes deadlocks with makefile objects,
#1744567

o kill FileWrapper and move the file vs socket close() handling to the pure
python socket._socketobject and socket._closedsocket wrappers, both adapted
from CPython 2.4.4

o move file_count down into _nonblocking_api_mixin so file objects' close()
works for UDP sockets. add a test for this

o kill socket.SocketTypes now that socket._socketobject always wraps both
_tcpsocket and _udpsocket

I think I'll wait for Alan to review this before committing
File Added: socket_fileobject2-r3591.diff