merge 3.4

diff --cc Lib/distutils/config.py
Simple merge

diff --cc Lib/distutils/tests/test_config.py
Simple merge

diff --cc Lib/distutils/tests/test_upload.py
index e836cc49471cd07f5eb5dc1b2df0816884df7713,bf4d558bf7d9cb935738584fecc5813ff65256f2..ce61b9ea54394b7989cdf96d44b90731d29631cc
--- 1/Lib/distutils/tests/test_upload.py
--- 2/Lib/distutils/tests/test_upload.py
+++ b/Lib/distutils/tests/test_upload.py
@@@ -134,10 -131,9 +134,10 @@@ class uploadTestCase(BasePyPIRCCommandT
          content_type = headers['Content-type']
          self.assertTrue(content_type.startswith('multipart/form-data'))
          self.assertEqual(self.last_open.req.get_method(), 'POST')
-         expected_url = 'https://pypi.python.org/pypi'
+         expected_url = 'https://upload.pypi.io/legacy/'
          self.assertEqual(self.last_open.req.get_full_url(), expected_url)
          self.assertTrue(b'xxx' in self.last_open.req.data)
 +        self.assertIn(b'protocol_version', self.last_open.req.data)
  
          # The PyPI response body was echoed
          results = self.get_logs(INFO)