Skip to content

Commit

Permalink
Merge pull request #989 from filmor/patch-1
Browse files Browse the repository at this point in the history
Always use the RequestsTransport to access pypi
  • Loading branch information
msarahan committed Jun 6, 2016
2 parents af94221 + 773b371 commit 13790f4
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions conda_build/pypi.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

from conda.cli.common import spec_from_line
from conda.compat import input, configparser, StringIO, string_types, PY3
from conda.config import get_proxy_servers
from conda.connection import CondaSession
from conda.fetch import (download, handle_proxy_407)
from conda.install import rm_rf
Expand Down Expand Up @@ -252,13 +251,7 @@ def _build_url(self, host, handler):


def get_xmlrpc_client(pypi_url):
proxies = get_proxy_servers()

if proxies:
transport = RequestsTransport()
else:
transport = None
return ServerProxy(pypi_url, transport=transport)
return ServerProxy(pypi_url, transport=RequestsTransport())


def main(args, parser):
Expand Down

0 comments on commit 13790f4

Please sign in to comment.