diff options
| author | Jannis Leidel <jannis@leidel.info> | 2012-01-07 17:34:15 +0100 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2012-01-07 17:34:15 +0100 |
| commit | efa479c50249b00493807a325f2713c592306fcb (patch) | |
| tree | 5a8d417baf48943b9bff309ea030b62d3a4c27b4 /pip/download.py | |
| parent | 550f6705d5b53d5b526f97b163a2e8a28966d7fe (diff) | |
| parent | 6d6ead7923b80271243dc59225b5a29b87f28306 (diff) | |
| download | pip-feature/pep381-verification.tar.gz | |
Merge branch 'develop' into feature/pep381-verificationfeature/pep381-verification
Conflicts:
pip/basecommand.py
pip/download.py
Diffstat (limited to 'pip/download.py')
| -rw-r--r-- | pip/download.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pip/download.py b/pip/download.py index d3ccdc27e..1a57ddb96 100644 --- a/pip/download.py +++ b/pip/download.py @@ -184,8 +184,8 @@ class URLOpener(object): self.prompting = prompting proxy = self.get_proxy(proxystr) if proxy: - handler = urllib2.ProxyHandler({"http": proxy, "ftp": proxy}) - opener = urllib2.build_opener(handler, urllib2.CacheFTPHandler) + proxy_support = urllib2.ProxyHandler({"http": proxy, "ftp": proxy, "https": proxy}) + opener = urllib2.build_opener(proxy_support, urllib2.CacheFTPHandler) urllib2.install_opener(opener) def parse_credentials(self, netloc): |