Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge 3.4

This commit is contained in:
Benjamin Peterson 2016-07-06 14:00:38 -07:00
parent 2279aeb282 ad04a85aff
commit 9409b4aa8f
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/distutils/config.py
View File

@ -21,7 +21,7 @@ password:%s
class PyPIRCCommand(Command): class PyPIRCCommand(Command):
"""Base command that knows how to handle the .pypirc file """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' DEFAULT_REALM = 'pypi'
repository = None repository = None
realm = None realm = None

4
Lib/distutils/tests/test_config.py
View File

@ -95,7 +95,7 @@ class PyPIRCCommandTestCase(BasePyPIRCCommandTestCase):
config = list(sorted(config.items())) config = list(sorted(config.items()))
waited = [('password', 'secret'), ('realm', 'pypi'), waited = [('password', 'secret'), ('realm', 'pypi'),
('repository', 'https://pypi.python.org/pypi'), ('repository', 'https://upload.pypi.io/legacy/'),
('server', 'server1'), ('username', 'me')] ('server', 'server1'), ('username', 'me')]
self.assertEqual(config, waited) self.assertEqual(config, waited)
@ -104,7 +104,7 @@ class PyPIRCCommandTestCase(BasePyPIRCCommandTestCase):
config = cmd._read_pypirc() config = cmd._read_pypirc()
config = list(sorted(config.items())) config = list(sorted(config.items()))
waited = [('password', 'secret'), ('realm', 'pypi'), waited = [('password', 'secret'), ('realm', 'pypi'),
('repository', 'https://pypi.python.org/pypi'), ('repository', 'https://upload.pypi.io/legacy/'),
('server', 'server-login'), ('username', 'tarek')] ('server', 'server-login'), ('username', 'tarek')]
self.assertEqual(config, waited) self.assertEqual(config, waited)

4
Lib/distutils/tests/test_upload.py
View File

@ -93,7 +93,7 @@ class uploadTestCase(BasePyPIRCCommandTestCase):
cmd.finalize_options() cmd.finalize_options()
for attr, waited in (('username', 'me'), ('password', 'secret'), for attr, waited in (('username', 'me'), ('password', 'secret'),
('realm', 'pypi'), ('realm', 'pypi'),
('repository', 'https://pypi.python.org/pypi')): ('repository', 'https://upload.pypi.io/legacy/')):
self.assertEqual(getattr(cmd, attr), waited) self.assertEqual(getattr(cmd, attr), waited)
def test_saved_password(self): def test_saved_password(self):
@ -134,7 +134,7 @@ class uploadTestCase(BasePyPIRCCommandTestCase):
content_type = headers['Content-type'] content_type = headers['Content-type']
self.assertTrue(content_type.startswith('multipart/form-data')) self.assertTrue(content_type.startswith('multipart/form-data'))
self.assertEqual(self.last_open.req.get_method(), 'POST') 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.assertEqual(self.last_open.req.get_full_url(), expected_url)
self.assertTrue(b'xxx' in self.last_open.req.data) self.assertTrue(b'xxx' in self.last_open.req.data)
self.assertIn(b'protocol_version', self.last_open.req.data) self.assertIn(b'protocol_version', self.last_open.req.data)