[Python-checkins] cpython (merge 3.4 -> 3.5): merge 3.4

Wed Jul 6 17:00:48 EDT 2016

https://hg.python.org/cpython/rev/e0853c7f5a3b
changeset: 102264:e0853c7f5a3b
branch: 3.5
parent: 102257:127569004538
parent: 102263:d239d41cc381
user: Benjamin Peterson <benjamin at python.org>
date: Wed Jul 06 14:00:38 2016 -0700
summary:
 merge 3.4
files:
 Lib/distutils/config.py | 2 +-
 Lib/distutils/tests/test_config.py | 4 ++--
 Lib/distutils/tests/test_upload.py | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Lib/distutils/config.py b/Lib/distutils/config.py
--- a/Lib/distutils/config.py
+++ b/Lib/distutils/config.py
@@ -21,7 +21,7 @@
 class PyPIRCCommand(Command):
 """Base command that knows how to handle the .pypirc file
 """
- DEFAULT_REPOSITORY = 'https://pypi.python.org/pypi'
+ DEFAULT_REPOSITORY = 'https://upload.pypi.io/legacy/'
 DEFAULT_REALM = 'pypi'
 repository = None
 realm = None
diff --git a/Lib/distutils/tests/test_config.py b/Lib/distutils/tests/test_config.py
--- a/Lib/distutils/tests/test_config.py
+++ b/Lib/distutils/tests/test_config.py
@@ -95,7 +95,7 @@
 
 config = list(sorted(config.items()))
 waited = [('password', 'secret'), ('realm', 'pypi'),
- ('repository', 'https://pypi.python.org/pypi'),
+ ('repository', 'https://upload.pypi.io/legacy/'),
 ('server', 'server1'), ('username', 'me')]
 self.assertEqual(config, waited)
 
@@ -104,7 +104,7 @@
 config = cmd._read_pypirc()
 config = list(sorted(config.items()))
 waited = [('password', 'secret'), ('realm', 'pypi'),
- ('repository', 'https://pypi.python.org/pypi'),
+ ('repository', 'https://upload.pypi.io/legacy/'),
 ('server', 'server-login'), ('username', 'tarek')]
 self.assertEqual(config, waited)
 
diff --git a/Lib/distutils/tests/test_upload.py b/Lib/distutils/tests/test_upload.py
--- a/Lib/distutils/tests/test_upload.py
+++ b/Lib/distutils/tests/test_upload.py
@@ -93,7 +93,7 @@
 cmd.finalize_options()
 for attr, waited in (('username', 'me'), ('password', 'secret'),
 ('realm', 'pypi'),
- ('repository', 'https://pypi.python.org/pypi')):
+ ('repository', 'https://upload.pypi.io/legacy/')):
 self.assertEqual(getattr(cmd, attr), waited)
 
 def test_saved_password(self):
@@ -134,7 +134,7 @@
 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)
-- 
Repository URL: https://hg.python.org/cpython
