+ fixed an obvious merge glitch in a windows-only test.

Patch by Hirokazu Yamamoto.

I added a _PyVerify_fd() call to os.device_encoding() (new in python 3.0)
which also uses a raw file descriptor.