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

Header processing by urllib2.Request #11

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Header processing by urllib2.Request #11

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2160370
default headers arguments to empty dictionaries
aronatkins Nov 25, 2013
90271f1
give urllib2.Request our headers in constructor. this means that thos…
aronatkins Nov 25, 2013
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
29 changes: 14 additions & 15 deletions sanction/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ def refresh(self):
self.request_token(refresh_token=self.refresh_token,
grant_type='refresh_token')

def request(self, url, method=None, data=None, headers=None, parser=None):
def request(self, url, method=None, data=None, headers={}, parser=None):
""" Request user data from the resource endpoint
:param url: The path to the resource and querystring if required
:param method: HTTP method. Defaults to ``GET`` unless data is not None
Expand Down Expand Up @@ -179,22 +179,24 @@ def request(self, url, method=None, data=None, headers=None, parser=None):
return parser(data)


def transport_headers(url, access_token, data=None, method=None, headers=None):
def transport_headers(url, access_token, data=None, method=None, headers={}):
all_headers = {}
all_headers.update(headers)
all_headers['Authorization'] = 'Bearer {}'.format(access_token)

try:
req = Request(url, data=data, method=method)
req = Request(url, data=data, method=method, headers=all_headers)
except TypeError:
req = Request(url, data=data)
req = Request(url, data=data, headers=all_headers)
req.get_method = lambda: method

add_headers = {'Authorization': 'Bearer {}'.format(access_token)}
if headers is not None:
add_headers.update(headers)

req.headers.update(add_headers)
return req


def transport_query(url, access_token, data=None, method=None, headers=None):
def transport_query(url, access_token, data=None, method=None, headers={}):
all_headers = {}
all_headers.update(headers)

parts = urlsplit(url)
query = dict(parse_qsl(parts.query))
query.update({
Expand All @@ -203,14 +205,11 @@ def transport_query(url, access_token, data=None, method=None, headers=None):
url = urlunsplit((parts.scheme, parts.netloc, parts.path,
urlencode(query), parts.fragment))
try:
req = Request(url, data=data, method=method)
req = Request(url, data=data, method=method, headers=all_headers)
except TypeError:
req = Request(url, data=data)
req = Request(url, data=data, headers=all_headers)
req.get_method = lambda: method

if headers is not None:
req.headers.update(headers)

return req


Expand Down