summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2013-12-22 01:45:42 +0100
committerAntoine Pitrou <solipsis@pitrou.net>2013-12-22 01:45:42 +0100
commit13766f65fc959da18e5d775ceb7a25ed71ed401e (patch)
tree071352beb8e8a26a59cbea6d221885bed7e3eb22
parent17a7b8192a8fcba2649854c844ae22fa0f512085 (diff)
parent9f4a8134cd20941bd90e6419948c7bdc83475ad0 (diff)
downloadpython-setuptools-git-13766f65fc959da18e5d775ceb7a25ed71ed401e.tar.gz
Issue #12226: HTTPS is now used by default when connecting to PyPI.
-rw-r--r--config.py2
-rw-r--r--tests/test_config.py4
-rw-r--r--tests/test_upload.py4
3 files changed, 5 insertions, 5 deletions
diff --git a/config.py b/config.py
index 1fd53346..a97635f2 100644
--- a/config.py
+++ b/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/tests/test_config.py b/tests/test_config.py
index 0e8d65e2..4de825a8 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -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)
diff --git a/tests/test_upload.py b/tests/test_upload.py
index df35b429..fbf80e38 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -77,7 +77,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):
@@ -117,7 +117,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(b'xxx', self.last_open.req.data)
def test_suite():