Skip to content

Fixes by @attilaolah #2

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
miketung merged 15 commits into from
Feb 21, 2014
Merged

Fixes by @attilaolah #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9b8ab8b
rm temporary variable
attilaolah Feb 20, 2014
f91ccad
rm empty line
attilaolah Feb 20, 2014
ce40017
use string formatting
attilaolah Feb 20, 2014
eec678b
no mutable default keyword args
attilaolah Feb 20, 2014
d9e3ce1
static attribute can be defined on the class level
attilaolah Feb 20, 2014
7a59f14
avoid choking on JSON in case the response that comes back is not suc…
attilaolah Feb 20, 2014
88d375a
remove redundant emptiness check of kwargs before update
attilaolah Feb 20, 2014
705d890
rm unused imports
attilaolah Feb 20, 2014
96c5430
newline at end of file
attilaolah Feb 20, 2014
ddf0aac
rm unused logger
attilaolah Feb 20, 2014
e065056
fix version number formatting
attilaolah Feb 20, 2014
42cc99a
apply e065056d597dc94ac3309af8582069bffcdfb276 to master
attilaolah Feb 20, 2014
5f7c090
Merge branch 'master' into cleanup-tests
attilaolah Feb 20, 2014
2579a26
Merge pull request #1 from attilaolah/master
mattbanister Feb 20, 2014
1ae7246
Merge pull request #2 from attilaolah/cleanup-tests
mattbanister Feb 20, 2014
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
19 changes: 8 additions & 11 deletions client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,31 @@


class DiffbotClient(object):
def __init__(self):
self.base_url = "http://api.diffbot.com/"

def request(self, url, token, api, fields=[], version=2, **kwargs):
base_url = 'http://api.diffbot.com/'

def request(self, url, token, api, fields=None, version=2, **kwargs):
"""
Returns a python object containing the requested resource from the diffbot api
"""
params = {"url": url, "token": token}
if fields:
params['fields'] = fields
if kwargs:
params.update(kwargs)
params.update(kwargs)
response = requests.get(self.compose_url(api, version), params=params)
obj = response.json()
return obj
response.raise_for_status()
return response.json()

def compose_url(self, api, version_number):
"""
Returns the uri for an endpoint as a string
"""
version = self.format_version_string(version_number)
url = self.base_url + version + "/" + api
return url
return '{}{}/{}'.format(self.base_url, version, api)

@staticmethod
def format_version_string(version_number):
"""
Returns a string representation of the API version
"""
version = "v" + str(version_number)
return version
return 'v{}'.format(version_number)
1 change: 0 additions & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
requests==2.1.0

9 changes: 2 additions & 7 deletions tests/unit_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
import os
import urlparse
import unittest
import simplejson
import logging
import requests
from mock import Mock, patch
from mock import patch

from client import DiffbotClient


logger = logging.getLogger(__name__)


def fake_get(url, params):
path = urlparse.urlparse(url).path
path_tuple = os.path.split(path)
Expand Down Expand Up @@ -82,4 +77,4 @@ def test_analyze_api(self):


if __name__ == '__main__':
unittest.main()
unittest.main()