diff options
author | Benjamin Peterson <benjamin@python.org> | 2013-03-18 22:20:56 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2013-03-18 22:20:56 (GMT) |
commit | 45c9704b739985fe2355fa812f4d9ef75279aa4b (patch) | |
tree | f2f7c394ed686177790be16598fb58eabc39f900 /Lib/distutils/config.py | |
parent | 35266f78b772bd7b13dc118206fa583264b1b2d3 (diff) | |
download | cpython-45c9704b739985fe2355fa812f4d9ef75279aa4b.zip cpython-45c9704b739985fe2355fa812f4d9ef75279aa4b.tar.gz cpython-45c9704b739985fe2355fa812f4d9ef75279aa4b.tar.bz2 |
use the HTTPS for pypi upload
Diffstat (limited to 'Lib/distutils/config.py')
-rw-r--r-- | Lib/distutils/config.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Lib/distutils/config.py b/Lib/distutils/config.py index 1fd5334..7439a83 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 = 'http://pypi.python.org/pypi' + DEFAULT_REPOSITORY = 'https://pypi.python.org/pypi' DEFAULT_REALM = 'pypi' repository = None realm = None @@ -83,6 +83,15 @@ class PyPIRCCommand(Command): current[key] = config.get(server, key) else: current[key] = default + + # work around people having "repository" for the "pypi" + # section of their config set to the HTTP (rather than + # HTTPS) URL + if (server == 'pypi' and + repository in (self.DEFAULT_REPOSITORY, 'pypi')): + current['repository'] = self.DEFAULT_REPOSITORY + return current + if (current['server'] == repository or current['repository'] == repository): return current |