Skip to content

Fix pyp2rpm to respect --proxy or env http_proxy/https_proxy… #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix pyp2rpm to respect --proxy or env http_proxy/https_proxy… #173

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 40 additions & 8 deletions pyp2rpm/convertor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,37 @@ def __init__(self, package=None, version=None,
if not self.template.endswith('.spec'):
self.template = '{0}.spec'.format(self.template)
self.rpm_name = rpm_name
self.proxy = proxy
#check and set proxy settings
Copy link
Member

Choose a reason for hiding this comment

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

Could this be a function/method on it's own?

Copy link
Author

Choose a reason for hiding this comment

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

@hroncok I will look at doing that today. I was away on vaca sorry for slow response.


self.use_proxy = None
if (os.environ.get('HTTP_PROXY') or os.environ.get('http_proxy')):
if(os.environ.get('HTTP_PROXY')):
self.use_proxy = "true"
self.http_proxy=os.environ.get('HTTP_PROXY')
elif(os.environ.get('http_proxy')):
self.use_proxy = "true"
self.http_proxy=os.environ.get('http_proxy')
else:
if proxy:
self.use_proxy = "true"
self.http_proxy=proxy
os.environ["http_proxy"] = "http://"+proxy
os.environ["HTTP_PROXY"] = "http://"+proxy

if (os.environ.get('HTTPS_PROXY') or os.environ.get('https_proxy')):
if(os.environ.get('HTTPS_PROXY')):
self.use_proxy = "true"
self.https_proxy=os.environ.get('HTTPS_PROXY')
elif(os.environ.get('https_proxy')):
self.use_proxy = "true"
self.https_proxy=os.environ.get('https_proxy')
else:
if proxy:
self.use_proxy = "true"
self.https_proxy=proxy
os.environ["https_proxy"] = "http://"+proxy
os.environ["HTTPS_PROXY"] = "http://"+proxy

self.venv = venv
self.autonc = autonc
self.pypi = True
Expand Down Expand Up @@ -287,17 +317,19 @@ def client(self):
Returns:
XMLRPC client for PyPI or None.
"""
if self.proxy:
proxyhandler = urllib.ProxyHandler({"http": self.proxy})
if self.use_proxy:
proxyhandler = urllib.ProxyHandler({"https": self.https_proxy, "http": self.http_proxy})
opener = urllib.build_opener(proxyhandler)
urllib.install_opener(opener)
transport = ProxyTransport()
if not hasattr(self, '_client'):
transport = None
if self.pypi:
if self.proxy:
logger.info('Using provided proxy: {0}.'.format(
self.proxy))
if self.use_proxy:
logger.info('Using provided http_proxy: {0}.'.format(self.http_proxy))
logger.info('Using provided https_proxy: {0}.'.format(self.https_proxy))
else:
transport = None

self._client = xmlrpclib.ServerProxy(settings.PYPI_URL,
transport=transport)
self._client_set = True
Expand All @@ -316,6 +348,6 @@ def request(self, host, handler, request_body, verbose):
request = urllib.Request(url)
request.add_data(request_body)
request.add_header("User-Agent", self.user_agent)
request.add_header("Content-Type", "text/html")
request.add_header("Content-Type", "text/xml")
f = urllib.urlopen(request)
return self.parse_response(f)