Skip to content

Fixing pep8 issues #65

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.

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
merged 23 commits into from
May 22, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
7d61799
Merge pull request #44 from s0b0lev/improvement/pull-request-template
Oct 28, 2017
3d5c7ad
Merge branch 'master' of https://github.com/sendgrid/python-http-client
mbernier Oct 29, 2017
23d8a0f
added docker build
mbernier Oct 29, 2017
b43db05
Merge pull request #50 from NdagiStanley/master
Oct 29, 2017
d72373c
Fixing pep8 issues
jlindenger Oct 30, 2017
d25c00a
fixing boolean operator position
jlindenger Oct 30, 2017
163fa10
simplify github PR template
pushkyn Oct 30, 2017
a05d3ba
Merge pull request #69 from pushkyn/simplify-github-pr-template
Oct 30, 2017
a8fc230
pep8 tweaks based on comments
jlindenger Oct 31, 2017
04f3275
Merge branch 'master' into fix-pep8-issues
jlindenger Oct 31, 2017
4774bac
Merge remote-tracking branch 'upstream/master'
jlindenger Oct 30, 2017
b1adf2d
Merge remote-tracking branch 'upstream/master'
jlindenger Oct 31, 2017
0439c58
missed one of the recommended review fixes
jlindenger Oct 31, 2017
bda113f
Merge pull request #22 from jussih/pickle-client
thinkingserious Oct 31, 2017
67dbcdc
Merge pull request #61 from dinosaurfiles/licensedaterange
Nov 1, 2017
7341084
Merge remote-tracking branch 'upstream/master'
jlindenger Nov 1, 2017
3eb7f0a
Merge branch 'master' into fix-pep8-issues
jlindenger Nov 1, 2017
c3c8b84
Merge remote-tracking branch 'upstream/master'
jlindenger Oct 30, 2017
4ed671a
Merge remote-tracking branch 'upstream/master'
jlindenger Oct 31, 2017
9c70f78
Merge branch 'master' into fix-pep8-issues
thinkingserious May 22, 2018
0fe5450
Fix merge issue
thinkingserious May 22, 2018
c2c3c6e
Add missing import
thinkingserious May 22, 2018
6aced08
More imports
thinkingserious May 22, 2018
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
4 changes: 2 additions & 2 deletions python_http_client/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from .client import Client
from .exceptions import (
from .client import Client # noqa
from .exceptions import ( # noqa
HTTPError,
BadRequestsError,
UnauthorizedError,
Expand Down
17 changes: 6 additions & 11 deletions python_http_client/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,7 @@ def _build_url(self, query_params):
if self._version:
url = self._build_versioned_url(url)
else:
url = self.host + url

self.host + url
return url

def _update_headers(self, request_headers):
Expand Down Expand Up @@ -220,25 +219,21 @@ def http_request(*_, **kwargs):
if 'request_body' not in kwargs:
data = None
else:

# Don't serialize to a JSON formatted str
# if we don't have a JSON Content-Type
# Don't serialize to a JSON formatted str if we don't have
# a JSON Content-Type
if 'Content-Type' in self.request_headers:
if self.request_headers['Content-Type'] != 'application\
/json':
if (self.request_headers['Content-Type'] !=
'application/json'):
data = kwargs['request_body'].encode('utf-8')
else:
data = json.dumps(
kwargs['request_body']).encode('utf-8')
else:
data = json.dumps(
kwargs['request_body']).encode('utf-8')

params = None
if 'query_params' in kwargs:
params = kwargs['query_params']
else:
params = None

opener = urllib.build_opener()
request = urllib.Request(self._build_url(params), data=data)
if self.request_headers:
Expand Down
19 changes: 10 additions & 9 deletions register.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
import pypandoc
import os


output = pypandoc.convert('README.md', 'rst')

with open('README.txt', 'w+') as f:
f.write(output)

with open('./README.txt') as f:
readme_rst = f.read()
readme_rst = open('./README.txt').read()

replace = ('[SendGrid Logo]\n'
'(https://uiux.s3.amazonaws.com/2016-logos/email-logo%402x.png)')
replace = """\
[SendGrid Logo]
(https://uiux.s3.amazonaws.com/2016-logos/email-logo%402x.png)"""

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')
replacement = """\
|SendGrid Logo|

final_text = readme_rst.replace(replace, replacement)
.. |SendGrid Logo| image:: \
https://uiux.s3.amazonaws.com/2016-logos/email-logo%402x.png
:target: https://www.sendgrid.com"""

final_text = readme_rst.replace(replace, replacement)
with open('./README.txt', 'w') as f:
f.write(final_text)
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
long_description = open('README.txt').read()


def getRequires():
def get_requires():
deps = []
if (2, 6) <= sys.version_info < (2, 7):
deps.append('unittest2')
Expand All @@ -28,7 +28,7 @@ def getRequires():
license='MIT',
description='HTTP REST client, simplified for Python',
long_description=long_description,
install_requires=getRequires(),
install_requires=get_requires(),
keywords=[
'REST',
'HTTP',
Expand Down
13 changes: 6 additions & 7 deletions tests/test_unit.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def __init__(self, host, response_code, timeout=None):
Client.__init__(self, host)

def _make_request(self, opener, request, timeout=None):
if 200 <= self.response_code < 299: # if successsful code
if 200 <= self.response_code < 299: # if successful code
return MockResponse(self.response_code)
else:
raise handle_error(MockException(self.response_code))
Expand Down Expand Up @@ -117,13 +117,12 @@ def test__build_url(self):
self.client._url_path = self.client._url_path + ['there']
self.client._url_path = self.client._url_path + [1]
self.client._version = 3

url = '{0}/v{1}{2}'.format(self.host,
str(self.client._version),
'/here/there/1?hello=0&' +
'world=1&ztest=0&ztest=1')
url = '{0}/v{1}{2}'.format(
self.host,
str(self.client._version),
'/here/there/1?hello=0&world=1&ztest=0&ztest=1'
)
query_params = {'hello': 0, 'world': 1, 'ztest': [0, 1]}

built_url = self.client._build_url(query_params)
self.assertEqual(built_url, url)

Expand Down