Skip to content

Commit e17d55e

Browse files
committed
fixed proxy problem with search and xlmrpc (with working tests)
1 parent ec93d4e commit e17d55e

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

pip/commands/search.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def run(self, options, args):
4444
return NO_MATCHES_FOUND
4545

4646
def search(self, query, index_url):
47-
pypi = xmlrpclib.ServerProxy(index_url, pip.download.urlopen.xmlrpclib_transport)
47+
pypi = xmlrpclib.ServerProxy(index_url, pip.download.xmlrpclib_transport)
4848
hits = pypi.search({'name': query, 'summary': query}, 'or')
4949
return hits
5050

pip/download.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ def send_request(self, connection, handler, request_body):
4141
def send_host(self, connection, host):
4242
connection.putheader('Host', self.realhost)
4343

44+
xmlrpclib_transport = xmlrpclib.Transport()
4445

4546
def get_file_content(url, comes_from=None):
4647
"""Gets the content of a file; it may be a filename, file: URL, or
@@ -152,11 +153,10 @@ def setup(self, proxystr='', prompting=True):
152153
proxy_support = urllib2.ProxyHandler({"http": proxy, "ftp": proxy, "https": proxy})
153154
opener = urllib2.build_opener(proxy_support, urllib2.CacheFTPHandler)
154155
urllib2.install_opener(opener)
155-
156+
156157
if proxy:
157-
self.xmlrpclib_transport = ProxiedTransport(proxy)
158-
else:
159-
self.xmlrpclib_transport = xmlrpclib.Transport()
158+
global xmlrpclib_transport
159+
xmlrpclib_transport = ProxiedTransport(proxy)
160160

161161
def parse_credentials(self, netloc):
162162
if "@" in netloc:

0 commit comments

Comments
 (0)