From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 6 Jul 2016 21:00:38 +0000 (-0700)
Subject: merge 3.4
X-Git-Tag: v3.6.0a3~32^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9409b4aa8f00c227b7157c7149ea3e4c8f1810b5;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

9409b4aa8f00c227b7157c7149ea3e4c8f1810b5
diff --cc Lib/distutils/tests/test_upload.py
index e836cc49471c,bf4d558bf7d9..ce61b9ea5439
--- a/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)