Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 34 additions & 6 deletions Orange/canvas/application/addons.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
from xml.sax.saxutils import escape
from distutils import version
from email.parser import HeaderParser
import urllib.request
import xmlrpc.client

import pkg_resources

Expand Down Expand Up @@ -629,14 +631,26 @@ def __on_installer_finished(self):
self.accept()


class SafeUrllibTransport(xmlrpc.client.Transport):
"""Urllib for HTTPS connections that automatically handles proxies."""

def single_request(self, host, handler, request_body, verbose=False):
req = urllib.request.Request('https://%s%s' % (host, handler), request_body)
req.add_header('User-agent', self.user_agent)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

req.add_header('Content-Type', 'text/xml')

req.add_header('Content-Type', 'text/xml')
self.verbose = verbose
opener = urllib.request.build_opener()
return self.parse_response(opener.open(req))


def list_pypi_addons():
"""
List add-ons available on pypi.
"""
from ..config import ADDON_PYPI_SEARCH_SPEC
import xmlrpc.client

pypi = xmlrpc.client.ServerProxy(
"https://pypi.python.org/pypi",
"https://pypi.python.org/pypi/",
transport=xmlrpc.client.SafeTransport()
)
addons = pypi.search(ADDON_PYPI_SEARCH_SPEC)
Expand Down Expand Up @@ -701,6 +715,20 @@ def observed(el):
return (el for el in iterable if not observed(el))


def _env_with_proxies():
"""
Return system environment with proxies obtained from urllib so that
they can be used with pip.
"""
proxies = urllib.request.getproxies()
env = dict(os.environ)
if "http" in proxies:
env["HTTP_PROXY"] = proxies["http"]
if "https" in proxies:
env["HTTPS_PROXY"] = proxies["https"]
return env


Install, Upgrade, Uninstall = 1, 2, 3


Expand Down Expand Up @@ -740,7 +768,7 @@ def fmt_cmd(cmd):
cmd = (["-m", "pip", "install"] +
(["--user"] if self.__user_install else []) +
[inst_name])
process = python_process(cmd, bufsize=-1, universal_newlines=True)
process = python_process(cmd, bufsize=-1, universal_newlines=True, env=_env_with_proxies())
retcode, output = self.__subprocessrun(process)

if retcode != 0:
Expand All @@ -755,7 +783,7 @@ def fmt_cmd(cmd):
cmd = (["-m", "pip", "install", "--upgrade", "--no-deps"] +
(["--user"] if self.__user_install else []) +
[inst_name])
process = python_process(cmd, bufsize=-1, universal_newlines=True)
process = python_process(cmd, bufsize=-1, universal_newlines=True, env=_env_with_proxies())
retcode, output = self.__subprocessrun(process)

if retcode != 0:
Expand All @@ -766,7 +794,7 @@ def fmt_cmd(cmd):
cmd = (["-m", "pip", "install"] +
(["--user"] if self.__user_install else []) +
[inst_name])
process = python_process(cmd, bufsize=-1, universal_newlines=True)
process = python_process(cmd, bufsize=-1, universal_newlines=True, env=_env_with_proxies())
retcode, output = self.__subprocessrun(process)

if retcode != 0:
Expand All @@ -778,7 +806,7 @@ def fmt_cmd(cmd):
self.setStatusMessage("Uninstalling {}".format(dist.project_name))

cmd = ["-m", "pip", "uninstall", "--yes", dist.project_name]
process = python_process(cmd, bufsize=-1, universal_newlines=True)
process = python_process(cmd, bufsize=-1, universal_newlines=True, env=_env_with_proxies())
retcode, output = self.__subprocessrun(process)

if self.__user_install:
Expand Down