cpython: e5a9755c967c (original) (raw)

Mercurial > cpython

changeset 88124:e5a9755c967c 3.3

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

Antoine Pitrou solipsis@pitrou.net
date	Sun, 22 Dec 2013 01:45:42 +0100
parents	927946b62d6b(current diff)2b5cd6d4d149(diff)
children	9839aa0e5b28 b63258b6eb4d
files	Lib/distutils/tests/test_config.py Lib/distutils/tests/test_upload.py Misc/NEWS
diffstat	4 files changed, 7 insertions(+), 5 deletions(-)[+] [-] Lib/distutils/config.py 2 Lib/distutils/tests/test_config.py 4 Lib/distutils/tests/test_upload.py 4 Misc/NEWS 2

line wrap: on

line diff

--- 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'[](#l1.7)

DEFAULT_REPOSITORY = 'https://pypi.python.org/pypi'[](#l1.8) DEFAULT_REALM = 'pypi' repository = None realm = None

--- a/Lib/distutils/tests/test_config.py +++ b/Lib/distutils/tests/test_config.py @@ -87,7 +87,7 @@ class PyPIRCCommandTestCase(support.Temp config = list(sorted(config.items())) waited = [('password', 'secret'), ('realm', 'pypi'),

             ('repository', 'http://pypi.python.org/pypi'),[](#l2.7)

             ('repository', 'https://pypi.python.org/pypi'),[](#l2.8)
             ('server', 'server1'), ('username', 'me')][](#l2.9)
   self.assertEqual(config, waited)[](#l2.10)

@@ -96,7 +96,7 @@ class PyPIRCCommandTestCase(support.Temp config = cmd._read_pypirc() config = list(sorted(config.items())) waited = [('password', 'secret'), ('realm', 'pypi'),

             ('repository', 'http://pypi.python.org/pypi'),[](#l2.16)

             ('repository', 'https://pypi.python.org/pypi'),[](#l2.17)
             ('server', 'server-login'), ('username', 'tarek')][](#l2.18)
   self.assertEqual(config, waited)[](#l2.19)

--- a/Lib/distutils/tests/test_upload.py +++ b/Lib/distutils/tests/test_upload.py @@ -77,7 +77,7 @@ class uploadTestCase(PyPIRCCommandTestCa cmd.finalize_options() for attr, waited in (('username', 'me'), ('password', 'secret'), ('realm', 'pypi'),

                        ('repository', 'http://pypi.python.org/pypi')):[](#l3.7)

                        ('repository', 'https://pypi.python.org/pypi')):[](#l3.8)
       self.assertEqual(getattr(cmd, attr), waited)[](#l3.9)

def test_saved_password(self): @@ -117,7 +117,7 @@ class uploadTestCase(PyPIRCCommandTestCa 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')[](#l3.16)

                    'https://pypi.python.org/pypi')[](#l3.17)
   self.assertIn(b'xxx', self.last_open.req.data)[](#l3.18)

def test_suite():

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -29,6 +29,8 @@ Core and Builtins 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