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

Issue #12226: HTTPS is now used by default when connecting to PyPI.

This commit is contained in:
Antoine Pitrou 2013-12-22 01:45:42 +01:00
parent 6783487757 f60b7df9f8
commit e8d07a9885
4 changed files with 7 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 = 'http://pypi.python.org/pypi' DEFAULT_REPOSITORY = 'https://pypi.python.org/pypi'
DEFAULT_REALM = 'pypi' DEFAULT_REALM = 'pypi'
repository = None repository = None
realm = None realm = None

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

@ -87,7 +87,7 @@ class PyPIRCCommandTestCase(support.TempdirManager,
config = list(sorted(config.items())) config = list(sorted(config.items()))
waited = [('password', 'secret'), ('realm', 'pypi'), waited = [('password', 'secret'), ('realm', 'pypi'),
('repository', 'http://pypi.python.org/pypi'), ('repository', 'https://pypi.python.org/pypi'),
('server', 'server1'), ('username', 'me')] ('server', 'server1'), ('username', 'me')]
self.assertEqual(config, waited) self.assertEqual(config, waited)
@ -96,7 +96,7 @@ class PyPIRCCommandTestCase(support.TempdirManager,
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', 'http://pypi.python.org/pypi'), ('repository', 'https://pypi.python.org/pypi'),
('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

@ -77,7 +77,7 @@ class uploadTestCase(PyPIRCCommandTestCase):
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', 'http://pypi.python.org/pypi')): ('repository', 'https://pypi.python.org/pypi')):
self.assertEqual(getattr(cmd, attr), waited) self.assertEqual(getattr(cmd, attr), waited)
def test_saved_password(self): def test_saved_password(self):
@ -117,7 +117,7 @@ class uploadTestCase(PyPIRCCommandTestCase):
self.assertTrue(headers['Content-type'].startswith('multipart/form-data')) self.assertTrue(headers['Content-type'].startswith('multipart/form-data'))
self.assertEqual(self.last_open.req.get_method(), 'POST') self.assertEqual(self.last_open.req.get_method(), 'POST')
self.assertEqual(self.last_open.req.get_full_url(), self.assertEqual(self.last_open.req.get_full_url(),
'http://pypi.python.org/pypi') 'https://pypi.python.org/pypi')
self.assertIn(b'xxx', self.last_open.req.data) self.assertIn(b'xxx', self.last_open.req.data)
def test_suite(): def test_suite():

2
Misc/NEWS
View File

@ -29,6 +29,8 @@ Core and Builtins
Library Library
------- -------
- Issue #12226: HTTPS is now used by default when connecting to PyPI.
- Issue #20045: Fix "setup.py register --list-classifiers". - Issue #20045: Fix "setup.py register --list-classifiers".
- Issue #18879: When a method is looked up on a temporary file, avoid closing - Issue #18879: When a method is looked up on a temporary file, avoid closing