Skip to content
Open
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions diffbot.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,14 @@ def api(self, name, url, **kwargs):
timeout = kwargs.get('timeout')
text = kwargs.get('text')
html = kwargs.get('html')
discussion = kwargs.get('discussion')
if text and html:
raise ValueError(u'Both `text` and `html` arguments provided!')
params = {'url': url, 'token': self._token}
if timeout:
params['timeout'] = timeout
if discussion:
params['discussion'] = discussion
if fields:
if not isinstance(fields, str):
fields = ','.join(sorted(fields))
Expand Down