diff options
author | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2009-02-19 23:23:47 +0000 |
---|---|---|
committer | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2009-02-19 23:23:47 +0000 |
commit | 2fc224f0904f398be79e40616cc8a4570375c786 (patch) | |
tree | ddbae8d7cc6f421ae36b904576e70479437da540 /Lib/os.py | |
parent | b672b6dea65dfae3c8ad04591642e8835f499da2 (diff) | |
download | cpython-git-2fc224f0904f398be79e40616cc8a4570375c786.tar.gz |
#5306: Fix compilation on Windows by properly merging change 69495.
+ 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.
Diffstat (limited to 'Lib/os.py')
0 files changed, 0 insertions, 0 deletions