Slowly apply part of #2065: py3k can be compiled with VS8.0
2 files changed