Skip to content

Commit 9cabf87

Browse files
Fix code style issues
1 parent f4cfe2a commit 9cabf87

File tree

6 files changed

+43
-26
lines changed

6 files changed

+43
-26
lines changed

examples/live_sendgrid_example.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,3 @@
6666
response = client.api_keys._(api_key_id).delete()
6767
print(response.status_code)
6868
print(response.headers)
69-

python_http_client/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,3 @@
1313
ServiceUnavailableError,
1414
GatewayTimeoutError
1515
)
16-

python_http_client/client.py

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ def _build_url(self, query_params):
117117
if query_params:
118118
url_values = urlencode(sorted(query_params.items()), True)
119119
url = '{0}?{1}'.format(url, url_values)
120-
url = self._build_versioned_url(url) if self._version else self.host + url
120+
url = (self._build_versioned_url(url) if self._version
121+
else self.host + url)
121122
return url
122123

123124
def _update_headers(self, request_headers):
@@ -207,21 +208,24 @@ def http_request(*_, **kwargs):
207208
if 'request_body' not in kwargs:
208209
data = None
209210
else:
210-
# Don't serialize to a JSON formatted str if we don't have a JSON Content-Type
211+
# Don't serialize to a JSON formatted str if
212+
# we don't have a JSON Content-Type
211213
if 'Content-Type' in self.request_headers:
212-
if self.request_headers['Content-Type'] != 'application/json':
213-
data = kwargs['request_body'].encode('utf-8')
214+
if (self.request_headers['Content-Type']
215+
!= 'application/json'):
216+
data = kwargs['request_body']
214217
else:
215-
data = json.dumps(kwargs['request_body']).encode('utf-8')
218+
data = json.dumps(kwargs['request_body'])
216219
else:
217-
data = json.dumps(kwargs['request_body']).encode('utf-8')
218-
params = kwargs['query_params'] if 'query_params' in kwargs else None
220+
data = json.dumps(kwargs['request_body'])
221+
data = data.encode('utf-8')
222+
params = kwargs.get('query_params')
219223
opener = urllib.build_opener()
220224
request = urllib.Request(self._build_url(params), data=data)
221225
if self.request_headers:
222226
for key, value in self.request_headers.items():
223227
request.add_header(key, value)
224-
if data and not ('Content-Type' in self.request_headers):
228+
if data and ('Content-Type' not in self.request_headers):
225229
request.add_header('Content-Type', 'application/json')
226230
request.get_method = lambda: method
227231
return Response(self._make_request(opener, request))

register.py

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,23 @@
11
import pypandoc
22
import os
33

4+
45
output = pypandoc.convert('README.md', 'rst')
5-
f = open('README.txt','w+')
6-
f.write(output)
7-
f.close()
8-
9-
readme_rst = open('./README.txt').read()
10-
replace = '[SendGrid Logo]\n(https://uiux.s3.amazonaws.com/2016-logos/email-logo%402x.png)'
11-
replacement = '|SendGrid Logo|\n\n.. |SendGrid Logo| image:: https://uiux.s3.amazonaws.com/2016-logos/email-logo%402x.png\n :target: https://www.sendgrid.com'
12-
final_text = readme_rst.replace(replace,replacement)
6+
7+
with open('README.txt', 'w+') as f:
8+
f.write(output)
9+
10+
with open('./README.txt') as f:
11+
readme_rst = f.read()
12+
13+
replace = ('[SendGrid Logo]\n'
14+
'(https://uiux.s3.amazonaws.com/2016-logos/email-logo%402x.png)')
15+
16+
replacement = ('|SendGrid Logo|\n\n.. |SendGrid Logo| image:: '
17+
'https://uiux.s3.amazonaws.com/2016-logos/email-logo%402x.png'
18+
'\n :target: https://www.sendgrid.com')
19+
20+
final_text = readme_rst.replace(replace, replacement)
21+
1322
with open('./README.txt', 'w') as f:
14-
f.write(final_text)
23+
f.write(final_text)

setup.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,19 @@
22
import os
33
from setuptools import setup
44

5+
56
long_description = 'Please see our GitHub README'
67
if os.path.exists('README.txt'):
78
long_description = open('README.txt').read()
89

10+
911
def getRequires():
1012
deps = []
1113
if (2, 6) <= sys.version_info < (2, 7):
1214
deps.append('unittest2')
1315
return deps
1416

17+
1518
base_url = 'https://github.com/sendgrid/'
1619
version = '3.0.0'
1720
setup(

tests/test_unit.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@
3030

3131

3232
class MockException(HTTPError):
33-
def __init__(self,code):
33+
34+
def __init__(self, code):
3435
self.code = code
3536
self.reason = 'REASON'
3637
self.hdrs = 'HEADERS'
38+
3739
def read(self):
3840
return 'BODY'
3941

@@ -60,18 +62,18 @@ def __init__(self, host, response_code):
6062
Client.__init__(self, host)
6163

6264
def _make_request(self, opener, request):
63-
if 200 <= self.response_code <299: # if successsful code
65+
if 200 <= self.response_code < 299: # if successsful code
6466
return MockResponse(self.response_code)
6567
else:
6668
raise handle_error(MockException(self.response_code))
6769

6870

69-
7071
class TestClient(unittest.TestCase):
72+
7173
def setUp(self):
7274
self.host = 'http://api.test.com'
7375
self.client = Client(host=self.host)
74-
self.api_key = "SENDGRID_API_KEY"
76+
self.api_key = 'SENDGRID_API_KEY'
7577
self.request_headers = {
7678
'Content-Type': 'application/json',
7779
'Authorization': 'Bearer ' + self.api_key
@@ -112,9 +114,10 @@ def test__build_url(self):
112114
self.client._url_path = self.client._url_path + ['there']
113115
self.client._url_path = self.client._url_path + [1]
114116
self.client._version = 3
115-
url = '{0}/v{1}{2}'.format(self.host,
116-
str(self.client._version),
117-
'/here/there/1?hello=0&world=1&ztest=0&ztest=1')
117+
url = '{0}/v{1}{2}'.format(
118+
self.host,
119+
str(self.client._version),
120+
'/here/there/1?hello=0&world=1&ztest=0&ztest=1')
118121
query_params = {'hello': 0, 'world': 1, 'ztest': [0,1]}
119122
built_url = self.client._build_url(query_params)
120123
self.assertEqual(built_url, url)

0 commit comments

Comments
 (0)