Fix argument ordering in pypi.py
Fix a bunch of little issues relating to patching distutils in pypi.py
Merge branch 'python3'
Handle case where PYTHONPATH is not set in pypi.py
More robust setup.py processing in pypi.py
Add PYTHONPATH debug output to pypi.py when setup.py fails
Fix potential environment variable setting issue in pypi.py
Merge branch 'python3'