Skip to content

use requests.session for performance improvement, simplify headers #8

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

Merged
sausman merged 1 commit into from
Jun 20, 2016
Merged

use requests.session for performance improvement, simplify headers #8

Show file tree
Hide file tree
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
9 changes: 5 additions & 4 deletions dwollav2/auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,18 @@
from dwollav2.version import version


session = requests.session()
session.headers.update({'user-agent': 'dwolla-v2-python %s' % version})


def _is_error(res):
try:
return 'error' in res.json()
except:
return True

def _request_token(client, payload):
headers = {
'user-agent': 'dwolla-v2-python %s' % version
}
res = requests.post(client.token_url, data=payload, headers=headers)
res = session.post(client.token_url, data=payload)
if _is_error(res):
raise Error.map(res)
token = client.Token(res.json())
Expand Down
28 changes: 13 additions & 15 deletions dwollav2/token.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@
from dwollav2.version import version


def _merge(x, y):
z = x.copy()
z.update(y)
return z
session = requests.session()
session.headers.update({
'accept': 'application/vnd.dwolla.v1.hal+json',
'user-agent': 'dwolla-v2-python %s' % version
})


def _items_or_iteritems(o):
try:
Expand Down Expand Up @@ -46,29 +48,25 @@ def __init__(self, opts = None, **kwargs):
self.scope = opts.get('scope')
self.app_id = opts.get('app_id')
self.account_id = opts.get('account_id')
session.headers.update({
'authorization': 'Bearer %s' % self.access_token
})

def post(self, url, body = None, headers = {}, **kwargs):
body = kwargs if body is None else body
if _contains_file(body):
files = [(k, v) for k, v in _items_or_iteritems(body) if _contains_file(v)]
data = [(k, v) for k, v in _items_or_iteritems(body) if not _contains_file(v)]
return Response(requests.post(self._full_url(url), headers=self._headers(headers), files=files, data=data))
return Response(session.post(self._full_url(url), headers=headers, files=files, data=data))
else:
return Response(requests.post(self._full_url(url), headers=self._headers(headers), json=body))
return Response(session.post(self._full_url(url), headers=headers, json=body))

def get(self, url, params = None, headers = {}, **kwargs):
params = kwargs if params is None else params
return Response(requests.get(self._full_url(url), headers=self._headers(headers), params=params))
return Response(session.get(self._full_url(url), headers=headers, params=params))

def delete(self, url, params = None, headers = {}):
return Response(requests.delete(self._full_url(url), headers=self._headers(headers), params=params))

def _headers(self, headers):
return _merge({
'accept': 'application/vnd.dwolla.v1.hal+json',
'authorization': 'Bearer %s' % self.access_token,
'user-agent': 'dwolla-v2-python %s' % version
}, headers)
return Response(session.delete(self._full_url(url), headers=headers, params=params))

def _full_url(self, path):
if isinstance(path, dict):
Expand Down