diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2013-12-22 00:35:53 (GMT) |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2013-12-22 00:35:53 (GMT) |
commit | 62003247016be2ace7f60f5f02005c52c87b2f61 (patch) | |
tree | c42054231782f521e72a6c5e2bec8744c30dc252 /Lib/distutils | |
parent | d105196c728110879b92984feb198b0bd600aaf9 (diff) | |
download | cpython-62003247016be2ace7f60f5f02005c52c87b2f61.zip cpython-62003247016be2ace7f60f5f02005c52c87b2f61.tar.gz cpython-62003247016be2ace7f60f5f02005c52c87b2f61.tar.bz2 |
Issue #12226: HTTPS is now used by default when connecting to PyPI.
Diffstat (limited to 'Lib/distutils')
-rw-r--r-- | Lib/distutils/config.py | 2 | ||||
-rw-r--r-- | Lib/distutils/tests/test_config.py | 4 | ||||
-rw-r--r-- | Lib/distutils/tests/test_upload.py | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Lib/distutils/config.py b/Lib/distutils/config.py index 1d32714..7dbcc46 100644 --- a/Lib/distutils/config.py +++ b/Lib/distutils/config.py @@ -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 diff --git a/Lib/distutils/tests/test_config.py b/Lib/distutils/tests/test_config.py index 7d1db5e..17db98f 100644 --- a/Lib/distutils/tests/test_config.py +++ b/Lib/distutils/tests/test_config.py @@ -89,7 +89,7 @@ class PyPIRCCommandTestCase(support.TempdirManager, config = config.items() config.sort() 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) @@ -99,7 +99,7 @@ class PyPIRCCommandTestCase(support.TempdirManager, config = config.items() config.sort() 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) diff --git a/Lib/distutils/tests/test_upload.py b/Lib/distutils/tests/test_upload.py index eed76b3..8b8262e 100644 --- a/Lib/distutils/tests/test_upload.py +++ b/Lib/distutils/tests/test_upload.py @@ -78,7 +78,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): @@ -119,7 +119,7 @@ class uploadTestCase(PyPIRCCommandTestCase): 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_full_url(), - 'http://pypi.python.org/pypi') + 'https://pypi.python.org/pypi') self.assertIn('xxx', self.last_open.req.data) auth = self.last_open.req.headers['Authorization'] self.assertNotIn('\n', auth) |