mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-23 11:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

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

Browse source
This commit is contained in:
Antoine Pitrou 2013-12-22 01:35:53 +01:00
parent ee7f3fc586
commit f60b7df9f8
4 changed files with 9 additions and 7 deletions
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)

8
Lib/distutils/tests/test_upload.py
View file

@ -72,11 +72,11 @@ class uploadTestCase(PyPIRCCommandTestCase):
def setUp(self): def setUp(self):
super(uploadTestCase, self).setUp() super(uploadTestCase, self).setUp()
self.old_class = httpclient.HTTPConnection self.old_class = httpclient.HTTPSConnection
self.conn = httpclient.HTTPConnection = FakeConnection() self.conn = httpclient.HTTPSConnection = FakeConnection()
def tearDown(self): def tearDown(self):
httpclient.HTTPConnection = self.old_class httpclient.HTTPSConnection = self.old_class
super(uploadTestCase, self).tearDown() super(uploadTestCase, self).tearDown()
def test_finalize_options(self): def test_finalize_options(self):
@ -88,7 +88,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):

2
Misc/NEWS
View file

@ -10,6 +10,8 @@ What's New in Python 3.2.6?
Library Library
------- -------
- Issue #12226: HTTPS is now used by default when connecting to PyPI.
- Issue #19435: Fix directory traversal attack on CGIHttpRequestHandler. - Issue #19435: Fix directory traversal attack on CGIHttpRequestHandler.
- Issue #14984: On POSIX systems, when netrc is called without a filename - Issue #14984: On POSIX systems, when netrc is called without a filename