From bd5b1049eb2c601e75528737e4c2cb90bfe95092 Mon Sep 17 00:00:00 2001 From: Chris Beauchamp Date: Fri, 17 Jan 2014 14:20:22 -0800 Subject: [PATCH 1/5] proper response without httpbody --- kiilib/client.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kiilib/client.py b/kiilib/client.py index 3439e25..04d6ead 100644 --- a/kiilib/client.py +++ b/kiilib/client.py @@ -34,8 +34,11 @@ def send(self, data = None): try: resp = urllib2.urlopen(req) - body = json.loads(resp.read()) - return (resp.code, body) + body = resp.read() + respBody = None + if(len(body) > 0): + respBody = json.loads(body) + return (resp.code, respBody) except urllib2.HTTPError, e: body = json.loads(e.read()) return (e.code, body) From 61fe4efdd074a827368b5d3c70fb79558addcab4 Mon Sep 17 00:00:00 2001 From: Chris Beauchamp Date: Fri, 17 Jan 2014 14:24:22 -0800 Subject: [PATCH 2/5] log test --- kiilib/client.py | 1 + setup.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/kiilib/client.py b/kiilib/client.py index 04d6ead..94f6c35 100644 --- a/kiilib/client.py +++ b/kiilib/client.py @@ -21,6 +21,7 @@ def setKiiHeaders(self, context, auth_required): self.headers['authorization'] = 'Bearer %s' % context.access_token def send(self, data = None): + print 'chris client' req = urllib2.Request( url = self.url, headers = self.headers) diff --git a/setup.py b/setup.py index 5ac60e3..1cd8836 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='kiilib', - version='0.1dev', + version='0.2dev', packages=['kiilib','kiilib/demo'], license='Apache 2.0', long_description=open('README.rst').read(), From 420a6353ed0a6fd7ddf47de684c7f1fc0af6a2f7 Mon Sep 17 00:00:00 2001 From: Chris Beauchamp Date: Fri, 17 Jan 2014 14:25:38 -0800 Subject: [PATCH 3/5] log test removed --- kiilib/client.py | 1 - 1 file changed, 1 deletion(-) diff --git a/kiilib/client.py b/kiilib/client.py index 94f6c35..04d6ead 100644 --- a/kiilib/client.py +++ b/kiilib/client.py @@ -21,7 +21,6 @@ def setKiiHeaders(self, context, auth_required): self.headers['authorization'] = 'Bearer %s' % context.access_token def send(self, data = None): - print 'chris client' req = urllib2.Request( url = self.url, headers = self.headers) From b8fe7f71c208eb97017e8d7761d211f96f26ff98 Mon Sep 17 00:00:00 2001 From: Chris Beauchamp Date: Fri, 17 Jan 2014 14:32:45 -0800 Subject: [PATCH 4/5] removed version upgrade --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 1cd8836..5ac60e3 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='kiilib', - version='0.2dev', + version='0.1dev', packages=['kiilib','kiilib/demo'], license='Apache 2.0', long_description=open('README.rst').read(), From 78658b9d8394a93b3b3acb8b1285aaaeb95f163e Mon Sep 17 00:00:00 2001 From: Chris Beauchamp Date: Fri, 17 Jan 2014 14:36:28 -0800 Subject: [PATCH 5/5] made into try/catch --- kiilib/client.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/kiilib/client.py b/kiilib/client.py index 04d6ead..5f2a9a0 100644 --- a/kiilib/client.py +++ b/kiilib/client.py @@ -34,11 +34,9 @@ def send(self, data = None): try: resp = urllib2.urlopen(req) - body = resp.read() - respBody = None - if(len(body) > 0): - respBody = json.loads(body) - return (resp.code, respBody) + return (resp.code, json.loads(resp.read())) + except ValueError, e: + return (resp.code, None) except urllib2.HTTPError, e: body = json.loads(e.read()) return (e.code, body)