(original) (raw)

changeset: 88124:e5a9755c967c branch: 3.3 parent: 88120:927946b62d6b parent: 88123:2b5cd6d4d149 user: Antoine Pitrou solipsis@pitrou.net date: Sun Dec 22 01:45:42 2013 +0100 files: Lib/distutils/tests/test_config.py Lib/distutils/tests/test_upload.py Misc/NEWS description: Issue #12226: HTTPS is now used by default when connecting to PyPI. diff -r 927946b62d6b -r e5a9755c967c Lib/distutils/config.py --- a/Lib/distutils/config.py Sun Dec 22 00:44:01 2013 +0100 +++ b/Lib/distutils/config.py Sun Dec 22 01:45:42 2013 +0100 @@ -21,7 +21,7 @@ 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 -r 927946b62d6b -r e5a9755c967c Lib/distutils/tests/test_config.py --- a/Lib/distutils/tests/test_config.py Sun Dec 22 00:44:01 2013 +0100 +++ b/Lib/distutils/tests/test_config.py Sun Dec 22 01:45:42 2013 +0100 @@ -87,7 +87,7 @@ 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 @@ 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) diff -r 927946b62d6b -r e5a9755c967c Lib/distutils/tests/test_upload.py --- a/Lib/distutils/tests/test_upload.py Sun Dec 22 00:44:01 2013 +0100 +++ b/Lib/distutils/tests/test_upload.py Sun Dec 22 01:45:42 2013 +0100 @@ -77,7 +77,7 @@ 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): @@ -117,7 +117,7 @@ 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(b'xxx', self.last_open.req.data) def test_suite(): diff -r 927946b62d6b -r e5a9755c967c Misc/NEWS --- a/Misc/NEWS Sun Dec 22 00:44:01 2013 +0100 +++ b/Misc/NEWS Sun Dec 22 01:45:42 2013 +0100 @@ -29,6 +29,8 @@ Library ------- +- Issue #12226: HTTPS is now used by default when connecting to PyPI. + - Issue #20045: Fix "setup.py register --list-classifiers". - Issue #18879: When a method is looked up on a temporary file, avoid closing /solipsis@pitrou.net