mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 00:23:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

use the HTTPS for pypi upload

Browse source
This commit is contained in:
Benjamin Peterson 2013-03-18 15:20:56 -07:00
parent 35266f78b7
commit 45c9704b73
4 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
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
@ -83,6 +83,15 @@ class PyPIRCCommand(Command):
current[key] = config.get(server, key) current[key] = config.get(server, key)
else: else:
current[key] = default current[key] = default
# work around people having "repository" for the "pypi"
# section of their config set to the HTTP (rather than
# HTTPS) URL
if (server == 'pypi' and
repository in (self.DEFAULT_REPOSITORY, 'pypi')):
current['repository'] = self.DEFAULT_REPOSITORY
return current
if (current['server'] == repository or if (current['server'] == repository or
current['repository'] == repository): current['repository'] == repository):
return current return current

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.4.0 Alpha 1?
Core and Builtins Core and Builtins
----------------- -----------------
- Use the HTTPS PyPI url for upload, overriding any plain HTTP URL in pypirc.
- Issue #16795: On the ast.arguments object, unify vararg with varargannotation - Issue #16795: On the ast.arguments object, unify vararg with varargannotation
and kwarg and kwargannotation. Change the column offset of ast.Attribute to be and kwarg and kwargannotation. Change the column offset of ast.Attribute to be
at the attribute name. at the attribute name.