summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Stufft <donald@stufft.io>2016-08-03 22:48:17 (GMT)
committerDonald Stufft <donald@stufft.io>2016-08-03 22:48:17 (GMT)
commitc6c2217f2770c3791310a930a05eb4e60bb33282 (patch)
tree5ad86db5b310e11cfcf97808acdd562222832fec
parent436fe5a447abb69e5e5a4f453325c422af02dcaa (diff)
parentfb7929044af4a8560e0da8f88905f4617b9042f5 (diff)
downloadcpython-c6c2217f2770c3791310a930a05eb4e60bb33282.zip
cpython-c6c2217f2770c3791310a930a05eb4e60bb33282.tar.gz
cpython-c6c2217f2770c3791310a930a05eb4e60bb33282.tar.bz2
Merge 3.3
-rw-r--r--Lib/distutils/config.py2
-rw-r--r--Lib/distutils/tests/test_config.py4
-rw-r--r--Lib/distutils/tests/test_upload.py4
3 files changed, 5 insertions, 5 deletions
diff --git a/Lib/distutils/config.py b/Lib/distutils/config.py
index 2d5770c..64c9b67 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 = 'https://upload.pypi.io/legacy/'
+ DEFAULT_REPOSITORY = 'https://upload.pypi.org/legacy/'
DEFAULT_REALM = 'pypi'
repository = None
realm = None
diff --git a/Lib/distutils/tests/test_config.py b/Lib/distutils/tests/test_config.py
index c373815..8286e1d 100644
--- a/Lib/distutils/tests/test_config.py
+++ b/Lib/distutils/tests/test_config.py
@@ -87,7 +87,7 @@ class PyPIRCCommandTestCase(support.TempdirManager,
config = list(sorted(config.items()))
waited = [('password', 'secret'), ('realm', 'pypi'),
- ('repository', 'https://upload.pypi.io/legacy/'),
+ ('repository', 'https://upload.pypi.org/legacy/'),
('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', 'https://upload.pypi.io/legacy/'),
+ ('repository', 'https://upload.pypi.org/legacy/'),
('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 bf4d558..cbbbe33 100644
--- a/Lib/distutils/tests/test_upload.py
+++ b/Lib/distutils/tests/test_upload.py
@@ -90,7 +90,7 @@ class uploadTestCase(PyPIRCCommandTestCase):
cmd.finalize_options()
for attr, waited in (('username', 'me'), ('password', 'secret'),
('realm', 'pypi'),
- ('repository', 'https://upload.pypi.io/legacy/')):
+ ('repository', 'https://upload.pypi.org/legacy/')):
self.assertEqual(getattr(cmd, attr), waited)
def test_saved_password(self):
@@ -131,7 +131,7 @@ class uploadTestCase(PyPIRCCommandTestCase):
content_type = headers['Content-type']
self.assertTrue(content_type.startswith('multipart/form-data'))
self.assertEqual(self.last_open.req.get_method(), 'POST')
- expected_url = 'https://upload.pypi.io/legacy/'
+ expected_url = 'https://upload.pypi.org/legacy/'
self.assertEqual(self.last_open.req.get_full_url(), expected_url)
self.assertTrue(b'xxx' in self.last_open.req.data)