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

Accept custom HTTP headers when reading over HTTP(S) #272

Merged
merged 15 commits into from
Jul 18, 2019
Merged

Accept custom HTTP headers when reading over HTTP(S) #272

Changes from 3 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
514ffed
Accept http headers
ampersand-five Mar 12, 2019
17ab8b9
Swapped headers var for the not global one
ampersand-five Mar 12, 2019
033e250
Changed headers to be a local var that is used if passed in
ampersand-five Mar 12, 2019
d48faa1
Headers global var copy vs assignment
ampersand-five Mar 18, 2019
06869db
flipped if else for headers check
ampersand-five Mar 18, 2019
da503bd
Merge branch 'master' into accept-http-headers
ampersand-five Mar 18, 2019
e361a00
Added header information to open() in http.py
ampersand-five Mar 18, 2019
cae71c0
Added tests
ampersand-five Mar 18, 2019
fb9b390
Added headers to seekable buffered input as well
ampersand-five Mar 18, 2019
1ff0cf6
fix test
mpenkov Jul 17, 2019
86d44f7
add top-level test
mpenkov Jul 17, 2019
6b02736
flake8 for http.py
mpenkov Jul 17, 2019
62669cd
Merge branch 'master' into accept-http-headers
mpenkov Jul 17, 2019
cde318f
respond to code review
mpenkov Jul 17, 2019
62e1726
update help.txt
mpenkov Jul 18, 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
9 changes: 7 additions & 2 deletions smart_open/http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class BufferedInputBase(io.BufferedIOBase):
"""

def __init__(self, url, mode='r', buffer_size=DEFAULT_BUFFER_SIZE,
kerberos=False, user=None, password=None):
kerberos=False, user=None, password=None, headers=None):
"""
If Kerberos is True, will attempt to use the local Kerberos credentials.
Otherwise, will try to use "basic" HTTP authentication via username/password.
Expand All @@ -48,7 +48,12 @@ def __init__(self, url, mode='r', buffer_size=DEFAULT_BUFFER_SIZE,
self.buffer_size = buffer_size
self.mode = mode

self.response = requests.get(url, auth=auth, stream=True, headers=_HEADERS)
if headers:
self.headers = headers
else:
self.headers = _HEADERS

self.response = requests.get(url, auth=auth, stream=True, headers=self.headers)

if not self.response.ok:
self.response.raise_for_status()
Expand Down