Skip to content

Used duck typing to determine whether or not 'r.json' is called #1

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
euclid1767 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Used duck typing to determine whether or not 'r.json' is called #1

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c328ee
Used duck typing to determine whether or not 'r.json' is called
Aug 12, 2013
35bf2c5
temp change propagation
Aug 13, 2013
566d4e9
undo
Aug 13, 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
2 changes: 1 addition & 1 deletion zinc/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def _req(self,method,url,data=None):
if data: logger.debug('Request data: %s',self._pjs(data))

r = getattr(requests,method)(fullurl,**kwargs).json
if isinstance(r,type(lambda:0)): r = r() # new requests uses r.json()
if hasattr(r, '__call__'): r = r() # new requests uses r.json()

try:
logger.debug('Response data: %s',self._pjs(r))
Expand Down