use the HTTPS for pypi upload
This commit is contained in:
parent
35266f78b7
commit
45c9704b73
|
@ -21,7 +21,7 @@ password:%s
|
|||
class PyPIRCCommand(Command):
|
||||
"""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'
|
||||
repository = None
|
||||
realm = None
|
||||
|
@ -83,6 +83,15 @@ class PyPIRCCommand(Command):
|
|||
current[key] = config.get(server, key)
|
||||
else:
|
||||
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
|
||||
current['repository'] == repository):
|
||||
return current
|
||||
|
|
|
@ -87,7 +87,7 @@ class PyPIRCCommandTestCase(support.TempdirManager,
|
|||
|
||||
config = list(sorted(config.items()))
|
||||
waited = [('password', 'secret'), ('realm', 'pypi'),
|
||||
('repository', 'http://pypi.python.org/pypi'),
|
||||
('repository', 'https://pypi.python.org/pypi'),
|
||||
('server', 'server1'), ('username', 'me')]
|
||||
self.assertEqual(config, waited)
|
||||
|
||||
|
@ -96,7 +96,7 @@ class PyPIRCCommandTestCase(support.TempdirManager,
|
|||
config = cmd._read_pypirc()
|
||||
config = list(sorted(config.items()))
|
||||
waited = [('password', 'secret'), ('realm', 'pypi'),
|
||||
('repository', 'http://pypi.python.org/pypi'),
|
||||
('repository', 'https://pypi.python.org/pypi'),
|
||||
('server', 'server-login'), ('username', 'tarek')]
|
||||
self.assertEqual(config, waited)
|
||||
|
||||
|
|
|
@ -72,11 +72,11 @@ class uploadTestCase(PyPIRCCommandTestCase):
|
|||
|
||||
def setUp(self):
|
||||
super(uploadTestCase, self).setUp()
|
||||
self.old_class = httpclient.HTTPConnection
|
||||
self.conn = httpclient.HTTPConnection = FakeConnection()
|
||||
self.old_class = httpclient.HTTPSConnection
|
||||
self.conn = httpclient.HTTPSConnection = FakeConnection()
|
||||
|
||||
def tearDown(self):
|
||||
httpclient.HTTPConnection = self.old_class
|
||||
httpclient.HTTPSConnection = self.old_class
|
||||
super(uploadTestCase, self).tearDown()
|
||||
|
||||
def test_finalize_options(self):
|
||||
|
@ -88,7 +88,7 @@ class uploadTestCase(PyPIRCCommandTestCase):
|
|||
cmd.finalize_options()
|
||||
for attr, waited in (('username', 'me'), ('password', 'secret'),
|
||||
('realm', 'pypi'),
|
||||
('repository', 'http://pypi.python.org/pypi')):
|
||||
('repository', 'https://pypi.python.org/pypi')):
|
||||
self.assertEqual(getattr(cmd, attr), waited)
|
||||
|
||||
def test_saved_password(self):
|
||||
|
|
|
@ -10,6 +10,8 @@ What's New in Python 3.4.0 Alpha 1?
|
|||
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
|
||||
and kwarg and kwargannotation. Change the column offset of ast.Attribute to be
|
||||
at the attribute name.
|
||||
|
|
Loading…
Reference in New Issue