Skip to content
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

Jump to bottom

Add User-Agent header when resolving via urllib #663

Merged
merged 2 commits into from
Feb 6, 2019
Merged

Add User-Agent header when resolving via urllib #663

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d43d578
Add User-Agent header when resolving via urllib
Feb 5, 2019
ecedeb7
Move User-Agent to Context
Feb 6, 2019
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
7 changes: 4 additions & 3 deletions pex/http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ class Context(AbstractClass):
"""

DEFAULT_ENCODING = 'iso-8859-1'
USER_AGENT = 'pex/%s' % PEX_VERSION

class Error(Exception):
"""Error base class for Contexts to wrap application-specific exceptions."""
Expand Down Expand Up @@ -135,7 +136,8 @@ class UrllibContext(Context):
"""Default Python standard library Context."""

def open(self, link):
return urllib_request.urlopen(link.url)
request = urllib_request.Request(link.url, headers={'User-Agent': self.USER_AGENT})
return urllib_request.urlopen(request)

def content(self, link):
if link.local:
Expand All @@ -146,7 +148,7 @@ def content(self, link):
return fp.read().decode(encoding, 'replace')

def resolve(self, link):
request = urllib_request.Request(link.url)
request = urllib_request.Request(link.url, headers={'User-Agent': self.USER_AGENT})
request.get_method = lambda: 'HEAD'
with contextlib.closing(urllib_request.urlopen(request)) as response:
return link.wrap(response.url)
Expand Down Expand Up @@ -209,7 +211,6 @@ def close(self):

class RequestsContext(Context):
"""A requests-based Context."""
USER_AGENT = 'pex/%s' % PEX_VERSION

@staticmethod
def _create_session(max_retries):
Expand Down