merge 3.5

This commit is contained in:
Donald Stufft 2016-07-06 17:50:21 -04:00
commit 77e8408346

View File

@ -128,7 +128,7 @@ class PyPIRCCommandTestCase(BasePyPIRCCommandTestCase):
config = list(sorted(config.items()))
waited = [('password', 'yh^%#rest-of-my-password'), ('realm', 'pypi'),
('repository', 'https://pypi.python.org/pypi'),
('repository', 'https://upload.pypi.io/legacy/'),
('server', 'server3'), ('username', 'cbiggles')]
self.assertEqual(config, waited)