Commit cbbadc22 authored by Donald Stufft's avatar Donald Stufft

Switch to the new upload url for PyPI

parent 4e0ac6d4
...@@ -21,7 +21,7 @@ password:%s ...@@ -21,7 +21,7 @@ password:%s
class PyPIRCCommand(Command): class PyPIRCCommand(Command):
"""Base command that knows how to handle the .pypirc file """Base command that knows how to handle the .pypirc file
""" """
DEFAULT_REPOSITORY = 'https://pypi.python.org/pypi' DEFAULT_REPOSITORY = 'https://upload.pypi.io/legacy/'
DEFAULT_REALM = 'pypi' DEFAULT_REALM = 'pypi'
repository = None repository = None
realm = None realm = None
......
...@@ -87,7 +87,7 @@ class PyPIRCCommandTestCase(support.TempdirManager, ...@@ -87,7 +87,7 @@ class PyPIRCCommandTestCase(support.TempdirManager,
config = list(sorted(config.items())) config = list(sorted(config.items()))
waited = [('password', 'secret'), ('realm', 'pypi'), waited = [('password', 'secret'), ('realm', 'pypi'),
('repository', 'https://pypi.python.org/pypi'), ('repository', 'https://upload.pypi.io/legacy/'),
('server', 'server1'), ('username', 'me')] ('server', 'server1'), ('username', 'me')]
self.assertEqual(config, waited) self.assertEqual(config, waited)
...@@ -96,7 +96,7 @@ class PyPIRCCommandTestCase(support.TempdirManager, ...@@ -96,7 +96,7 @@ class PyPIRCCommandTestCase(support.TempdirManager,
config = cmd._read_pypirc() config = cmd._read_pypirc()
config = list(sorted(config.items())) config = list(sorted(config.items()))
waited = [('password', 'secret'), ('realm', 'pypi'), waited = [('password', 'secret'), ('realm', 'pypi'),
('repository', 'https://pypi.python.org/pypi'), ('repository', 'https://upload.pypi.io/legacy/'),
('server', 'server-login'), ('username', 'tarek')] ('server', 'server-login'), ('username', 'tarek')]
self.assertEqual(config, waited) self.assertEqual(config, waited)
......
...@@ -90,7 +90,7 @@ class uploadTestCase(PyPIRCCommandTestCase): ...@@ -90,7 +90,7 @@ class uploadTestCase(PyPIRCCommandTestCase):
cmd.finalize_options() cmd.finalize_options()
for attr, waited in (('username', 'me'), ('password', 'secret'), for attr, waited in (('username', 'me'), ('password', 'secret'),
('realm', 'pypi'), ('realm', 'pypi'),
('repository', 'https://pypi.python.org/pypi')): ('repository', 'https://upload.pypi.io/legacy/')):
self.assertEqual(getattr(cmd, attr), waited) self.assertEqual(getattr(cmd, attr), waited)
def test_saved_password(self): def test_saved_password(self):
...@@ -131,7 +131,7 @@ class uploadTestCase(PyPIRCCommandTestCase): ...@@ -131,7 +131,7 @@ class uploadTestCase(PyPIRCCommandTestCase):
content_type = headers['Content-type'] content_type = headers['Content-type']
self.assertTrue(content_type.startswith('multipart/form-data')) self.assertTrue(content_type.startswith('multipart/form-data'))
self.assertEqual(self.last_open.req.get_method(), 'POST') self.assertEqual(self.last_open.req.get_method(), 'POST')
expected_url = 'https://pypi.python.org/pypi' expected_url = 'https://upload.pypi.io/legacy/'
self.assertEqual(self.last_open.req.get_full_url(), expected_url) self.assertEqual(self.last_open.req.get_full_url(), expected_url)
self.assertTrue(b'xxx' in self.last_open.req.data) self.assertTrue(b'xxx' in self.last_open.req.data)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment