From 9b8ab8b6604de158b28ae52b6ce9bebc4bafe388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20Ol=C3=A1h?= Date: Thu, 20 Feb 2014 13:10:48 +0700 Subject: [PATCH 01/12] rm temporary variable --- client.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/client.py b/client.py index 6fce288..3a6cbf8 100644 --- a/client.py +++ b/client.py @@ -15,8 +15,7 @@ def request(self, url, token, api, fields=[], version=2, **kwargs): if kwargs: params.update(kwargs) response = requests.get(self.compose_url(api, version), params=params) - obj = response.json() - return obj + return response.json() def compose_url(self, api, version_number): """ From f91ccad4e3f66e7ceca5c4f777105dfb86fb1718 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20Ol=C3=A1h?= Date: Thu, 20 Feb 2014 13:10:54 +0700 Subject: [PATCH 02/12] rm empty line --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4713d5f..815c51c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1 @@ requests==2.1.0 - From ce4001734728ad787d61a7833e9242192ab507ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20Ol=C3=A1h?= Date: Thu, 20 Feb 2014 13:13:15 +0700 Subject: [PATCH 03/12] use string formatting --- client.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/client.py b/client.py index 3a6cbf8..1e4f401 100644 --- a/client.py +++ b/client.py @@ -22,13 +22,11 @@ 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) From eec678bbf8084bcead84c22ee6d8279a4cb67207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20Ol=C3=A1h?= Date: Thu, 20 Feb 2014 13:14:16 +0700 Subject: [PATCH 04/12] no mutable default keyword args --- client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client.py b/client.py index 1e4f401..5efa4b9 100644 --- a/client.py +++ b/client.py @@ -5,7 +5,7 @@ class DiffbotClient(object): def __init__(self): self.base_url = "http://api.diffbot.com/" - def request(self, url, token, api, fields=[], version=2, **kwargs): + def request(self, url, token, api, fields=None, version=2, **kwargs): """ Returns a python object containing the requested resource from the diffbot api """ From d9e3ce14a65513f8fce54a65cf0c9095e66c9285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20Ol=C3=A1h?= Date: Thu, 20 Feb 2014 13:18:52 +0700 Subject: [PATCH 05/12] static attribute can be defined on the class level --- client.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client.py b/client.py index 5efa4b9..d9c4b15 100644 --- a/client.py +++ b/client.py @@ -2,8 +2,8 @@ class DiffbotClient(object): - def __init__(self): - self.base_url = "http://api.diffbot.com/" + + base_url = 'http://api.diffbot.com/' def request(self, url, token, api, fields=None, version=2, **kwargs): """ From 7a59f14942df6ced54eaee21d76286ba842f7f8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20Ol=C3=A1h?= Date: Thu, 20 Feb 2014 13:20:46 +0700 Subject: [PATCH 06/12] avoid choking on JSON in case the response that comes back is not successful --- client.py | 1 + 1 file changed, 1 insertion(+) diff --git a/client.py b/client.py index d9c4b15..9b397b9 100644 --- a/client.py +++ b/client.py @@ -15,6 +15,7 @@ def request(self, url, token, api, fields=None, version=2, **kwargs): if kwargs: params.update(kwargs) response = requests.get(self.compose_url(api, version), params=params) + response.raise_for_status() return response.json() def compose_url(self, api, version_number): From 88d375a4028a1c3f7e6c3fb125f0dd50c28ccf3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20Ol=C3=A1h?= Date: Thu, 20 Feb 2014 13:23:09 +0700 Subject: [PATCH 07/12] remove redundant emptiness check of kwargs before update --- client.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/client.py b/client.py index 9b397b9..e635d0c 100644 --- a/client.py +++ b/client.py @@ -12,8 +12,7 @@ def request(self, url, token, api, fields=None, version=2, **kwargs): 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) response.raise_for_status() return response.json() From 705d89054a2de0b17a9b7e10007f9be61e715511 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20Ol=C3=A1h?= Date: Thu, 20 Feb 2014 13:29:21 +0700 Subject: [PATCH 08/12] rm unused imports --- tests/unit_test.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/unit_test.py b/tests/unit_test.py index a8d2c3e..59dfc12 100644 --- a/tests/unit_test.py +++ b/tests/unit_test.py @@ -1,10 +1,9 @@ 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 From 96c5430bcfb229ff050f3cfaa22bb67b48b369f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20Ol=C3=A1h?= Date: Thu, 20 Feb 2014 13:29:26 +0700 Subject: [PATCH 09/12] newline at end of file --- tests/unit_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit_test.py b/tests/unit_test.py index 59dfc12..681334b 100644 --- a/tests/unit_test.py +++ b/tests/unit_test.py @@ -81,4 +81,4 @@ def test_analyze_api(self): if __name__ == '__main__': - unittest.main() \ No newline at end of file + unittest.main() From ddf0aac3cf8a14992558c1a6a5b95c303db82052 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20Ol=C3=A1h?= Date: Thu, 20 Feb 2014 13:31:54 +0700 Subject: [PATCH 10/12] rm unused logger --- tests/unit_test.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/unit_test.py b/tests/unit_test.py index 681334b..fe510a0 100644 --- a/tests/unit_test.py +++ b/tests/unit_test.py @@ -1,16 +1,12 @@ import os import urlparse import unittest -import logging import requests 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) From e065056d597dc94ac3309af8582069bffcdfb276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20Ol=C3=A1h?= Date: Thu, 20 Feb 2014 22:46:58 +0700 Subject: [PATCH 11/12] fix version number formatting --- client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client.py b/client.py index e635d0c..a9068f3 100644 --- a/client.py +++ b/client.py @@ -29,4 +29,4 @@ def format_version_string(version_number): """ Returns a string representation of the API version """ - return '{}v'.format(version_number) + return 'v{}'.format(version_number) From 42cc99a9c19834c56c426dc0ecb6c9cdc673aff5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20Ol=C3=A1h?= Date: Thu, 20 Feb 2014 22:49:04 +0700 Subject: [PATCH 12/12] apply e065056d597dc94ac3309af8582069bffcdfb276 to master --- client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client.py b/client.py index e635d0c..a9068f3 100644 --- a/client.py +++ b/client.py @@ -29,4 +29,4 @@ def format_version_string(version_number): """ Returns a string representation of the API version """ - return '{}v'.format(version_number) + return 'v{}'.format(version_number)